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

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

b25b61e5a28ca7a746474ae57e7c04c0783515f7