aboutsummaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-08-31 17:31:02 -1000
committerLinus Torvalds <torvalds@linux-foundation.org>2009-08-31 17:31:02 -1000
commitaf3998909772f766f27ba432f281d60098354269 (patch)
tree8cafac0135aeae7c0c5fd4797b427ca797d33d6c /fs
parent1a37f184fa7824982a5f434c06981ec46a66cef7 (diff)
parentd95c5b0b905aa9b70521eeb83ad4aea85f5e5fd0 (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 (12564a): MAINTAINERS: Update gspca sn9c20x name style V4L/DVB (12502): gspca - sn9c20x: Fix gscpa sn9c20x build errors. V4L/DVB (12495): em28xx: Don't call em28xx_ir_init when disable_ir is true V4L/DVB (12457): zr364: wrong indexes V4L/DVB (12451): Update KConfig File to enable SDIO and USB interfaces V4L/DVB (12450): Siano: Fixed SDIO compilation bugs V4L/DVB (12449): adds webcam for Micron device MT9M111 0x143A to em28xx V4L/DVB (12446): sms1xxx: restore GPIO functionality for all Hauppauge devices
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions