diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-23 23:24:29 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-23 23:24:29 -0300 |
| commit | f51b34c7b1a7348ee4a25c9ac4b99bd7b5209b4a (patch) | |
| tree | 6f0cee236f66055b2f4f1b06060fd585b87ced70 /arch | |
| parent | 695cd41d15c2132548ce6af0ecf3f5e767828268 (diff) | |
| parent | 8670dd13f9229356fad6cbcbc6e44a582a6eda35 (diff) | |
Merge branch 'next' of ../pending
* 'next' of ../pending:
V4L/DVB (11135): cx231xx: use usb_make_path() for bus_info
V4L/DVB (11134): cx231xx: dmesg cleanup
V4L/DVB (11133): cx231xx: don't print pcb config debug messages by default
V4L/DVB (11132): cx231xx: usb probe cleanups
V4L/DVB (11131): cx231xx: avoid trying to access unfilled dev struct
V4L/DVB (11130): cx231xx: fix an inverted logic at vidioc_streamoff
V4L/DVB (11129): cx231xx: Use generic names for each device block
V4L/DVB (11128): cx231xx: convert the calls to subdev format
V4L/DVB (11038): Fix the issue with audio module & correction of Names
V4L/DVB (10989): cx25840: cx23885 detection was broken
V4L/DVB (10982): cx231xx: fix compile warning
V4L/DVB (10958): cx231xx: some additional CodingStyle and minor fixes
V4L/DVB (10957a): cx231xx: Fix compilation breakage
V4L/DVB (10957): cx231xx: Fix CodingStyle
V4L/DVB (10956): cx231xx: First series of manual CodingStyle fixes
V4L/DVB (10955): cx231xx: CodingStyle automatic fixes with Lindent
V4L/DVB (10954): Add cx231xx USB driver
V4L/DVB (10953): cx25840: Fix CodingStyle errors introduced by the last patch
V4L/DVB (10952): cx25840: prepare it to be used by cx231xx module
Conflicts:
include/linux/i2c-id.h
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions