From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 24 Aug 2012 04:11:46 +0000 (+1000)
Subject: Merge remote-tracking branch 'battery/master'
X-Git-Tag: next-20120824~46
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e2f68d8acbf619413e17c213b74cf0175787b785;p=karo-tx-linux.git

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

e2f68d8acbf619413e17c213b74cf0175787b785