]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'staging/staging-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 25 Sep 2012 06:13:53 +0000 (16:13 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 25 Sep 2012 06:14:00 +0000 (16:14 +1000)
commitc0bfd0d3ea10d18f53e38d81125853643cc266e6
tree2913857a3fba4a6ce6f96fb871d1e3aaa02d21cf
parent7b078b0652ce370b4f2a3e924e6bd85a4702b04d
parent62fea8c8f1bf5ca33ba55b3f421d9598a68297ee
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
17 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/Kconfig
drivers/staging/Makefile
drivers/staging/android/binder.c
drivers/staging/ccg/Kconfig
drivers/staging/ccg/ccg.c
drivers/staging/dgrp/dgrp_specproc.c
drivers/staging/et131x/et131x.c
drivers/staging/ipack/devices/ipoctal.c
drivers/staging/omap-thermal/omap-thermal-common.c
drivers/staging/omapdrm/omap_gem.c
drivers/staging/serqt_usb2/serqt_usb2.c
drivers/staging/usbip/usbip_common.c