From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 22 Aug 2011 02:17:11 +0000 (+1000)
Subject: Merge remote-tracking branch 'battery/master'
X-Git-Tag: next-20110822~32
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4fd286142cd8f063dd22ccef104ba95714da1f61;p=karo-tx-linux.git

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

4fd286142cd8f063dd22ccef104ba95714da1f61