]> err.no Git - linux-2.6/commitdiff
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)
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


No differences found