From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 30 Sep 2011 01:49:32 +0000 (+1000)
Subject: Merge remote-tracking branch 'battery/master'
X-Git-Tag: next-20110930~45
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3a198777bd05cc4d153e1153620affc9edbb4fde;p=karo-tx-linux.git

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

3a198777bd05cc4d153e1153620affc9edbb4fde