From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 21 Mar 2013 02:56:16 +0000 (+1100)
Subject: Merge remote-tracking branch 'battery/master'
X-Git-Tag: next-20130321~45
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=067f22ac99a97ca16266aa1c3958b513ed67da05;p=karo-tx-linux.git

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

067f22ac99a97ca16266aa1c3958b513ed67da05