tree 7eac24b3b406f0bc9cb06eb8fe7cd19254275cba
parent db16826367fefcb0ddb93d76b66adc52eb4e6339
parent 3f48258e50ef44d92a0e5c69c0cc5e663162d246
author Linus Torvalds <torvalds@linux-foundation.org> 1253804056 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1253804056 -0700

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