]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.11/battery' into for-next
authorJiri Kosina <jkosina@suse.cz>
Wed, 29 May 2013 13:22:43 +0000 (15:22 +0200)
committerJiri Kosina <jkosina@suse.cz>
Wed, 29 May 2013 13:22:43 +0000 (15:22 +0200)

Trivial merge