From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 4 Apr 2013 02:37:28 +0000 (+1100)
Subject: Merge remote-tracking branch 'battery/master'
X-Git-Tag: next-20130404~51
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=860f7f210badea4b91ffa6e71601600366a442ee;p=karo-tx-linux.git

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

860f7f210badea4b91ffa6e71601600366a442ee