Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Thu, 3 Oct 2013 23:30:46 +0000 (00:30 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 3 Oct 2013 23:30:46 +0000 (00:30 +0100)
commit7d89516d246691c9a82e75563294df01b768f1d6
treec7f94630245e9afdb28a07361976cd80ac997a38
parent67a681c0333be267b80a509151a4553760069bb2
parent18d8ff256f495bee7bcf016d9006d4b330e29260
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
drivers/hid/hid-input.c
drivers/hid/hid-multitouch.c
include/linux/hid.h