]> 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, 28 Jun 2013 05:29:57 +0000 (15:29 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Jun 2013 05:30:00 +0000 (15:30 +1000)
commit27edb6bd2c314e0c19e1e8f63b3ed7ed05d1c35d
treec5278cf728e5835603d16a560a3cca56117c9a86
parentc0585cda4391a277e1a2fd2ab2f0dc06859c213d
parent0ad1ea69545b1965be4c93ee03fdc685c6beb23d
Merge remote-tracking branch 'staging/staging-next'

Conflicts:
Documentation/devicetree/bindings/thermal/ti_soc_thermal.txt
drivers/staging/serqt_usb2/serqt_usb2.c
drivers/staging/silicom/bpctl_mod.c
drivers/thermal/ti-soc-thermal/ti-thermal-common.c
13 files changed:
MAINTAINERS
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/android/binder.c
drivers/staging/comedi/comedi_fops.c
drivers/staging/csr/netdev.c
drivers/staging/fwserial/fwserial.c
drivers/staging/imx-drm/ipuv3-crtc.c
drivers/staging/lustre/lustre/include/linux/lustre_patchless_compat.h
drivers/staging/lustre/lustre/llite/rw26.c
drivers/staging/rtl8192u/r8192U_core.c
drivers/staging/serqt_usb2/serqt_usb2.c
drivers/staging/silicom/bpctl_mod.c