]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'staging/staging-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 05:34:02 +0000 (15:34 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 05:34:02 +0000 (15:34 +1000)
commit6101f27562a6af47dcf7e30be6fab3fb4068d88e
tree805e193c44025b8afc6295f0fcfe53e542f965d9
parentfba0e5c6b1d6a509441849b0a5b060ce37c04b45
parentaec46bbdeab172a2129ef4e64051e706cbe9ec56
Merge remote-tracking branch 'staging/staging-next'

Conflicts:
drivers/staging/rtl8821ae/core.c
18 files changed:
Documentation/devicetree/bindings/vendor-prefixes.txt
Documentation/driver-model/devres.txt
MAINTAINERS
arch/x86/Kconfig
drivers/staging/android/binder.c
drivers/staging/et131x/et131x.c
drivers/staging/imx-drm/imx-hdmi.c
drivers/staging/imx-drm/parallel-display.c
drivers/staging/lustre/lustre/lclient/lcommon_cl.c
drivers/staging/lustre/lustre/llite/file.c
drivers/staging/lustre/lustre/llite/llite_internal.h
drivers/staging/lustre/lustre/llite/lloop.c
drivers/staging/lustre/lustre/llite/rw.c
drivers/staging/lustre/lustre/llite/rw26.c
drivers/staging/lustre/lustre/llite/vvp_io.c
drivers/staging/netlogic/xlr_net.c
drivers/staging/rtl8821ae/core.c
include/linux/device.h