Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 6 Apr 2008 23:11:57 +0000 (16:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 6 Apr 2008 23:11:57 +0000 (16:11 -0700)
commit28b8383d5d4d9b636c3734c993563bafdc2ab3c3
tree95fd3fc6e12cdca5cbf999595273bda9ae104922
parentc28cf0fdcd38e912fa72258d78cb213b716247d6
parenta80c5aa6da485da63def31442a19cdd6ff495ce6
Merge git://git./linux/kernel/git/mchehab/v4l-dvb

* git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
  V4L/DVB (7499): v4l/dvb Kconfig: Fix bugzilla #10067
  V4L/DVB (7495): s5h1409: fix blown-away bit in function s5h1409_set_gpio
  V4L/DVB (7460): bttv: Bt832 - fix possible NULL pointer deref