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)
1  2 
drivers/hid/hid-input.c
drivers/hid/hid-multitouch.c
include/linux/hid.h

Simple merge
Simple merge
Simple merge