From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 24 Sep 2009 14:54:16 +0000 (-0700)
Subject: Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab... 
X-Git-Tag: v2.6.32-rc1~61
X-Git-Url: https://git.kernel.dk/?p=linux-block.git;a=commitdiff_plain;h=9f6ac7850a9c6363f4117fd2248e232a2d534627

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 (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
---

9f6ac7850a9c6363f4117fd2248e232a2d534627