]> 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, 27 Sep 2012 05:16:53 +0000 (15:16 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 27 Sep 2012 05:16:53 +0000 (15:16 +1000)
commit35431a2000374420693d3f0d78811b4ddc0c7f28
tree586b1184c2362253ee923e106de6adc72baf8605
parent775a68c195f56dd8827cd64facd8913fe68273ce
parent27020ffed9166d65ce1e5b523051d13bfa2329b0
Merge remote-tracking branch 'staging/staging-next'

Conflicts:
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/android/binder.c
drivers/staging/ipack/devices/ipoctal.c
drivers/staging/omap-thermal/omap-thermal-common.c
drivers/staging/serqt_usb2/serqt_usb2.c
18 files changed:
drivers/hid/Kconfig
drivers/hid/Makefile
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/power/Kconfig
drivers/power/Makefile
drivers/staging/Kconfig
drivers/staging/Makefile
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/omapdrm/omap_drv.c
drivers/staging/omapdrm/omap_gem.c
drivers/staging/serqt_usb2/serqt_usb2.c
drivers/staging/usbip/usbip_common.c