From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 26 Jul 2011 03:39:38 +0000 (+1000)
Subject: Merge remote-tracking branch 'battery/master'
X-Git-Tag: next-20110726~29
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=717fdd41764b96974a0f56d7d84a17b7b3ef5750;p=karo-tx-linux.git

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

717fdd41764b96974a0f56d7d84a17b7b3ef5750