Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
commitea9e7b5569a538123dc4d60ba36b9170ca8e8830
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 17 Dec 2007 17:56:29 +0000 (17 09:56 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 17 Dec 2007 17:56:29 +0000 (17 09:56 -0800)
tree138de44791101f83193df5733f98f0117805d139
parent980110c5da56cb56d3356f5a5251fdc920f83ba6
parent2300317f30770abd625fb051b0e5d373ce55a6ad
Merge git://git./linux/kernel/git/mchehab/v4l-dvb

* git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
  V4L/DVB (6820): s5h1409: QAM SNR related fixes
  V4L/DVB (6819): i2c: fix drivers/media/video/bt866.c
  V4L/DVB (6814): Makefile: always enter video/
  V4L/DVB (6798): saa7134: enable LNA in analog mode for Hauppauge WinTV HVR-1110
  V4L/DVB (6803): buf-core.c locking fixes