]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'staging/staging-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 6 Jan 2014 08:08:51 +0000 (19:08 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 6 Jan 2014 08:08:51 +0000 (19:08 +1100)
commitb708fd9e1ad461a0a4d640f4a970dd5b6373af45
tree963b0525eedb44c57f9c6e13729f881934cb826b
parente24231a7a97f5a1e929c6ff1fe239ee9c9c6bd13
parenta6e8e3a470bf96575eebfa9dbfda6e1ec8929fb8
Merge remote-tracking branch 'staging/staging-next'

Conflicts:
drivers/staging/imx-drm/imx-drm-core.c
Documentation/devicetree/bindings/staging/dwc2.txt
Documentation/devicetree/bindings/vendor-prefixes.txt
drivers/staging/dwc2/hcd.c
drivers/staging/lustre/lustre/llite/lloop.c
drivers/staging/media/as102/as102_drv.c
drivers/staging/ozwpan/ozproto.c
drivers/staging/usbip/usbip_common.c