Merge branches 'for-3.11/battery', 'for-3.11/elo', 'for-3.11/holtek' and 'for-3.11...
authorJiri Kosina <jkosina@suse.cz>
Thu, 4 Jul 2013 13:01:01 +0000 (15:01 +0200)
committerJiri Kosina <jkosina@suse.cz>
Thu, 4 Jul 2013 13:01:01 +0000 (15:01 +0200)
commitdb58316892a5e9034efe718d4c1630788db7528f
treec12d57181bb65807b0b7260163667cbd6308822b
parentd0a934b764c67b4bf626f5b7cf725a6e3066afd2
parentd8e5aec8d9e8754e4b4e12d9b61dc89fe229349b
parentc99f81887850cb593ea02bd14a68062547db8261
parent811adb9622de310efbb661531c3ec0ae5d2b2bc0
Merge branches 'for-3.11/battery', 'for-3.11/elo', 'for-3.11/holtek' and 'for-3.11/i2c-hid-fixed' into for-linus
drivers/hid/Kconfig
drivers/hid/Makefile
drivers/hid/hid-core.c