Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 2 Apr 2007 20:52:10 +0000 (13:52 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 2 Apr 2007 20:52:10 +0000 (13:52 -0700)
commit5c0efdbc1b1891857659594741a4cb6405b63126
treecd929de572575bb768ae4f792ad26c27d7e70283
parent9a5ee4cc9ef8de5185114237a81f5f395e21d8fd
parent1489f90a49f0603a393e1800d729050f6e332bec
Merge branch 'master' of ssh:///linux/kernel/git/mchehab/v4l-dvb

* 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
  V4L/DVB (5496): Pluto2: fix incorrect TSCR register setting
  V4L/DVB (5495): Tda10086: fix DiSEqC message length