]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'staging/staging-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 17 Sep 2012 07:36:52 +0000 (17:36 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 17 Sep 2012 07:36:57 +0000 (17:36 +1000)
commit85bf597e44416f2f032587a5314596ec4a70e56a
tree8e1b58cbd8e4477c367512d65c0f23f38a749485
parent4767203ba09a7e1326a9eaed9a0885cd645564cc
parent6a2a2cdd57d11ee3117539b846a45df6efbd35b1
Merge remote-tracking branch 'staging/staging-next'

Conflicts:
drivers/staging/ipack/devices/ipoctal.c
drivers/staging/omap-thermal/omap-thermal-common.c
13 files changed:
drivers/hid/Kconfig
drivers/hid/Makefile
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/hid/hid-sensor-hub.c
drivers/staging/android/binder.c
drivers/staging/ccg/Kconfig
drivers/staging/ccg/ccg.c
drivers/staging/et131x/et131x.c
drivers/staging/ipack/devices/ipoctal.c
drivers/staging/omap-thermal/omap-thermal-common.c
drivers/staging/serqt_usb2/serqt_usb2.c
drivers/staging/usbip/usbip_common.c