From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 30 Apr 2012 01:36:43 +0000 (+1000)
Subject: Merge remote-tracking branch 'v4l-dvb/master'
X-Git-Tag: next-20120430~64
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=743d5b6658e3e84229091aaec92558407f474d41;p=karo-tx-linux.git

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

Conflicts:
	drivers/usb/gadget/uvc_queue.c
---

743d5b6658e3e84229091aaec92558407f474d41