git.kernelconcepts.de Git - karo-tx-linux.git/commit

]> git.kernelconcepts.de Git - karo-tx-linux.git/commit

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 21 May 2014 05:39:03 +0000 (15:39 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 21 May 2014 05:39:03 +0000 (15:39 +1000)
commit	c2c5be0583039c6ceb96f4e2d0552b66b8a185fa
tree	0eee276e6d5ed31ec9d2f44d5a39b611bd2f5672	tree \| snapshot
parent	5431f2edefd45a7bc2a09b0af9e973b331a7ce67	commit \| diff
parent	8d9e9857c576d8d710ae6a6152a6ddcd29772bb1	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
Documentation/driver-model/devres.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/iio/adc/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/iio/adc/exynos_adc.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/imu/inv_mpu6050/inv_mpu_core.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/android/binder.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/imx-drm/imx-hdmi.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/imx-drm/parallel-display.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/lclient/lcommon_cl.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/llite/file.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/llite/llite_internal.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/llite/lloop.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/llite/rw.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/llite/rw26.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/llite/vvp_io.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/netlogic/xlr_net.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/speakup/kobjects.c	diff1 \|	diff2 \|	blob \| history
include/linux/device.h	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules

Documentation/devicetree/bindings/vendor-prefixes.txt	diff1 \|	diff2 \|	blob \| history
Documentation/driver-model/devres.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/iio/adc/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/iio/adc/exynos_adc.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/imu/inv_mpu6050/inv_mpu_core.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/android/binder.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/imx-drm/imx-hdmi.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/imx-drm/parallel-display.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/lclient/lcommon_cl.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/llite/file.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/llite/llite_internal.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/llite/lloop.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/llite/rw.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/llite/rw26.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/llite/vvp_io.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/netlogic/xlr_net.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/speakup/kobjects.c	diff1 \|	diff2 \|	blob \| history
include/linux/device.h	diff1 \|	diff2 \|	blob \| history