From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 21 Mar 2006 16:52:18 +0000 (-0800)
Subject: Merge branch 'origin'
X-Git-Tag: MMI-PSA29.97-13-9~51599^2~49
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b05005772f34497eb2b7415a651fe785cbe70e16;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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
---

b05005772f34497eb2b7415a651fe785cbe70e16