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

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

Thu, 9 Apr 2015 02:55:18 +0000 (12:55 +1000)

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

Thu, 9 Apr 2015 02:55:18 +0000 (12:55 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 02:55:18 +0000 (12:55 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 02:55:18 +0000 (12:55 +1000)
diff --cc drivers/media/dvb-core/dvb_net.c
Simple merge
diff --cc drivers/usb/gadget/function/uvc_v4l2.c
Simple merge
diff --cc drivers/usb/gadget/function/uvc_video.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 9 Apr 2015 02:55:18 +0000 (12:55 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 9 Apr 2015 02:55:18 +0000 (12:55 +1000)
		1	2
drivers/media/dvb-core/dvb_net.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/function/uvc_v4l2.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/function/uvc_video.c	patch \|	diff1 \|	diff2 \|	blob \| history