Merge remote-tracking branch 'v4l-dvb/master'

author Stephen Rothwell <sfr@canb.auug.org.au>

Mon, 20 Aug 2012 02:40:53 +0000 (12:40 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Mon, 20 Aug 2012 02:40:53 +0000 (12:40 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 20 Aug 2012 02:40:53 +0000 (12:40 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 20 Aug 2012 02:40:53 +0000 (12:40 +1000)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/media/usb/gspca/jl2005bcd.c
Simple merge
diff --cc drivers/media/usb/gspca/spca506.c
Simple merge
diff --cc drivers/media/usb/siano/smsusb.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 20 Aug 2012 02:40:53 +0000 (12:40 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 20 Aug 2012 02:40:53 +0000 (12:40 +1000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/media/usb/gspca/jl2005bcd.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/media/usb/gspca/spca506.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/media/usb/siano/smsusb.c	patch \|	diff1 \|	diff2 \|	blob \| history