From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 1 Sep 2009 03:31:02 +0000 (-1000)
Subject: Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab... 
X-Git-Tag: MMI-PSA29.97-13-9~27052
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=af3998909772f766f27ba432f281d60098354269;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'for_linus' of git://git./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
---

af3998909772f766f27ba432f281d60098354269