Merge branch 'power-supply-scope' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorAnton Vorontsov <cbouatmailru@gmail.com>
Wed, 4 Jan 2012 05:09:35 +0000 (09:09 +0400)
committerAnton Vorontsov <cbouatmailru@gmail.com>
Wed, 4 Jan 2012 05:09:35 +0000 (09:09 +0400)

Trivial merge