tree b176aeb7fa9baf69e77ddd83e844727490bfcf28
parent 044f324f6ea5d55391db62fca6a295b2651cb946
parent 7705a8792b0fc82fd7d4dd923724606bbfd9fb20
author Linus Torvalds <torvalds@g5.osdl.org> 1142959938 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> 1142959938 -0800

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