Merge branch 'hid-battery' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy...
authorJiri Kosina <jkosina@suse.cz>
Mon, 9 Jan 2012 10:24:59 +0000 (11:24 +0100)
committerJiri Kosina <jkosina@suse.cz>
Mon, 9 Jan 2012 10:24:59 +0000 (11:24 +0100)
commit420174afdc7023c000e5b5b1b6fe9e028470c713
treea50385761d11bef88689c53317d52f431bab3f9a
parente0273728564a395a13cfed70e34da4f2613d2d44
parent652aa6a9ac4a5f8d3e1fa3f6466646519e83c01e
Merge branch 'hid-battery' of git://git./linux/kernel/git/jeremy/xen into for-linus
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/hid/hid-input.c
include/linux/hid.h