From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 21 Sep 2011 02:34:53 +0000 (+1000)
Subject: Merge remote-tracking branch 'battery/master'
X-Git-Tag: next-20110921~44
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=08cac88d9c77cefe11773565b1f548bde7b75f89;p=karo-tx-linux.git

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

08cac88d9c77cefe11773565b1f548bde7b75f89