From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 27 Sep 2011 03:13:13 +0000 (+1000)
Subject: Merge remote-tracking branch 'battery/master'
X-Git-Tag: next-20110927~45
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=992512ebed6368ebf9fcb26b8abfabf16779ea18;p=karo-tx-linux.git

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

992512ebed6368ebf9fcb26b8abfabf16779ea18