From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 6 Apr 2008 23:11:57 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
X-Git-Tag: v2.6.25-rc9~56
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=28b8383d5d4d9b636c3734c993563bafdc2ab3c3

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

28b8383d5d4d9b636c3734c993563bafdc2ab3c3