]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'staging/staging-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Mar 2014 05:06:43 +0000 (16:06 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Mar 2014 05:06:47 +0000 (16:06 +1100)
commit0a5d2a80f6b284fdf2a8985e9ca7b5ee6f8c4c67
tree917160e990b82b43017d82d6b3de9cef1bf048dd
parentbdb65c4db33b1635ecf0dac9c38c5a050d3b3dfb
parent843a01f20af180d238cfcb5456e30404c2f4cc37
Merge remote-tracking branch 'staging/staging-next'

Conflicts:
arch/arm/boot/dts/imx51-babbage.dts
arch/arm/boot/dts/imx53-mba53.dts
arch/arm/boot/dts/imx53-qsb.dts
drivers/staging/cxt1e1/linux.c
15 files changed:
MAINTAINERS
arch/arm/boot/dts/imx51-babbage.dts
arch/arm/boot/dts/imx53-m53evk.dts
arch/arm/boot/dts/imx53-mba53.dts
arch/arm/boot/dts/imx53-qsb-common.dtsi
arch/arm/boot/dts/imx53-qsb.dts
arch/arm/boot/dts/imx6dl.dtsi
arch/arm/boot/dts/imx6q.dtsi
arch/arm/boot/dts/imx6qdl-sabresd.dtsi
arch/arm/boot/dts/imx6qdl.dtsi
drivers/staging/android/Kconfig
drivers/staging/cxt1e1/linux.c
drivers/staging/rtl8188eu/Kconfig
drivers/usb/core/message.c
include/linux/hid-sensor-ids.h