]> 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, 20 Sep 2012 05:44:04 +0000 (15:44 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 20 Sep 2012 05:44:09 +0000 (15:44 +1000)
commitdd7fa47cbaf83a818125c05f47ec4cdc49a1fc06
tree60f907966fde609d422c1a73972aa3e697feb0a1
parent20b84c1c50902cf6e0f2f974aa88d0ebd8460bd8
parent5d06e3df280bd230e2eadc16372e62818c63e894
Merge remote-tracking branch 'staging/staging-next'

Conflicts:
drivers/staging/ipack/devices/ipoctal.c
drivers/staging/omap-thermal/omap-thermal-common.c
drivers/staging/serqt_usb2/serqt_usb2.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