]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'staging/staging-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 8 Jan 2014 03:59:52 +0000 (14:59 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 8 Jan 2014 03:59:52 +0000 (14:59 +1100)
commit38c0a853b0e0cf9da16b98b3024a6148f3b5cd88
treed779d9425a97eacfbf9bf3ef2a5d2d0aed1a3ab7
parent84128fd68e691370a5aeceb13963604b0189c4a6
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