diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-24 07:54:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-24 07:54:16 -0700 |
| commit | 9f6ac7850a9c6363f4117fd2248e232a2d534627 (patch) | |
| tree | 7eac24b3b406f0bc9cb06eb8fe7cd19254275cba /drivers/rapidio/rio.c | |
| parent | db16826367fefcb0ddb93d76b66adc52eb4e6339 (diff) | |
| parent | 3f48258e50ef44d92a0e5c69c0cc5e663162d246 (diff) | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
V4L/DVB (13039): dib0700: not building CONFIG_DVB_TUNER_DIB0070 breaks compilation
V4L/DVB (13038): dvbdev: Remove an anoying/uneeded warning
V4L/DVB (13037): go7007: Revert compatibility code added at the wrong place
media: video: Fix build in saa7164
Diffstat (limited to 'drivers/rapidio/rio.c')
0 files changed, 0 insertions, 0 deletions