]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Merge branch 'origin'
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 21 Mar 2006 16:52:18 +0000 (08:52 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 21 Mar 2006 16:52:18 +0000 (08:52 -0800)
commitb05005772f34497eb2b7415a651fe785cbe70e16
treeb176aeb7fa9baf69e77ddd83e844727490bfcf28
parent044f324f6ea5d55391db62fca6a295b2651cb946
parent7705a8792b0fc82fd7d4dd923724606bbfd9fb20
Merge branch 'origin'

Conflicts:
Documentation/video4linux/CARDLIST.cx88
drivers/media/video/cx88/Kconfig
drivers/media/video/em28xx/em28xx-video.c
drivers/media/video/saa7134/saa7134-dvb.c

Resolved as in the original merge by Mauro Carvalho Chehab
drivers/media/dvb/dvb-usb/vp7045.c
drivers/media/video/cx88/Kconfig
drivers/media/video/mxb.c
include/linux/dvb/video.h
include/linux/videodev2.h