Merge branch 'bq27x00-for-upstream' of git://git.metafoo.de/linux-2.6
authorAnton Vorontsov <cbouatmailru@gmail.com>
Mon, 28 Feb 2011 14:37:13 +0000 (17:37 +0300)
committerAnton Vorontsov <cbouatmailru@gmail.com>
Mon, 28 Feb 2011 14:37:13 +0000 (17:37 +0300)

Trivial merge