]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'staging/staging-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 May 2014 06:27:48 +0000 (16:27 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 May 2014 06:27:48 +0000 (16:27 +1000)
commit31c0b4293166597615cce6e4db5da78858c24ca7
tree57dd5c362366da9c89f0a6ac395a72c0c7b8cc7f
parent546354e508200b56357286ca2ada07cd924d9c1c
parent19440266b8876b5b6674162a43063192f12e3518
Merge remote-tracking branch 'staging/staging-next'

Conflicts:
drivers/iio/adc/Kconfig
drivers/staging/rtl8723au/os_dep/usb_ops_linux.c
20 files changed:
Documentation/devicetree/bindings/vendor-prefixes.txt
Documentation/driver-model/devres.txt
MAINTAINERS
arch/x86/Kconfig
drivers/iio/adc/Kconfig
drivers/iio/adc/exynos_adc.c
drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
drivers/staging/android/binder.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/speakup/kobjects.c
include/linux/device.h