tree a50385761d11bef88689c53317d52f431bab3f9a
parent e0273728564a395a13cfed70e34da4f2613d2d44
parent 652aa6a9ac4a5f8d3e1fa3f6466646519e83c01e
author Jiri Kosina <jkosina@suse.cz> 1326104699 +0100
committer Jiri Kosina <jkosina@suse.cz> 1326104699 +0100

Merge branch 'hid-battery' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen into for-linus