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)

Trivial merge