Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 22 May 2007 23:47:51 +0000 (16:47 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 22 May 2007 23:47:51 +0000 (16:47 -0700)
commit7992018d979460af59fbae8a48f9641305aea438
treede64367c49aa76606e7ea8354b299d067f1c0bda
parent5fd52203e1856ad925b1a6adae9a22e533da94e2
parentedd75ede2d40eadb98e07d87e88fa970f86ffe9e
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 (5691): Ov7670: reset clkrc in rgb565 mode
  V4L/DVB (5690): Cafe_ccic: Properly power down the sensor
  V4L/DVB (5680): Tuner-simple.c fix suport for SECAM with FI1216MF
  V4L/DVB (5630): Dvb-core: Handle failures to create devices
  V4L/DVB (5639a): Fix dst usage count
  V4L/DVB (5670): Adding new fields to v4l2_pix_format broke the ABI, reverted that change
  V4L/DVB (5640): Fix: em28xx shouldn't be selecting VIDEO_BUF
  V4L/DVB (5639): Fix Kconfig dependencies for ivtv