]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'staging/staging-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 05:33:56 +0000 (15:33 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 05:34:01 +0000 (15:34 +1000)
commitcf96930d3dbf4970282006fcca6db7d6b99b7226
treeddbdf0b85824241bc04b772f126ccc62544db0f6
parent94d0c8584870244146831e18175f9c89f2787804
parentd0941b1e07c129da4afc725c2c982b97e99e040f
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
MAINTAINERS
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/csr/netdev.c
drivers/staging/fwserial/fwserial.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