tree 138de44791101f83193df5733f98f0117805d139
parent 980110c5da56cb56d3356f5a5251fdc920f83ba6
parent 2300317f30770abd625fb051b0e5d373ce55a6ad
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1197914189 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1197914189 -0800

Merge git://git.kernel.org/pub/scm/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