Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 1 Oct 2007 15:02:57 +0000 (08:02 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 1 Oct 2007 15:02:57 +0000 (08:02 -0700)
commitca45fe8ea86f7a1cf11a6d3bf8bba082be4ea341
treea648796673c6f99fe7931c00e4891bab6bc1d48a
parent50ef295119645215c076700e7ddf4869df5f56ce
parentcb50f548c0ee9b2aac39743fc4021a7188825a98
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 (6052): ivtv: fix udma yuv bug