]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'v4l-dvb/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 Apr 2012 01:36:43 +0000 (11:36 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 Apr 2012 01:36:43 +0000 (11:36 +1000)
commit743d5b6658e3e84229091aaec92558407f474d41
treeceec6d123ab1a4ecc663470913eba49e966fadd8
parentb401c0a0719637403a2f956f95fcbba4256ed07b
parent2a43f0bc4ed82cf3f637e3b8501644d67c1181ac
Merge remote-tracking branch 'v4l-dvb/master'

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