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)

Trivial merge