From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 13 Dec 2011 04:05:09 +0000 (+1100)
Subject: Merge remote-tracking branch 'battery/master'
X-Git-Tag: next-20111213~45
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d9d080320fd839905674a08b9a692da9259b12b6;p=karo-tx-linux.git

Merge remote-tracking branch 'battery/master'
---

d9d080320fd839905674a08b9a692da9259b12b6