]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'battery/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 04:13:18 +0000 (14:13 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 04:13:20 +0000 (14:13 +1000)
commitca5fa5d7197821044e083dc3e571e10ea068ea2c
treef2991caf6565896354e0854360da03ceb6538a53
parent46a0211e6da61a5598bff4f1b7e6d35cfa896e8f
parent5939d9dfe4406a49d8688eb827d88abcaf233c42
Merge remote-tracking branch 'battery/master'

Conflicts:
drivers/hid/wacom.h
drivers/hid/wacom_sys.c
MAINTAINERS
drivers/acpi/battery.c
drivers/hid/hid-input.c
drivers/hid/hid-sony.c
drivers/hid/wacom.h
drivers/hid/wacom_sys.c
drivers/hid/wacom_wac.c
drivers/iio/adc/Kconfig
include/linux/hid.h