From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 29 Jul 2011 03:55:27 +0000 (+1000)
Subject: Merge remote-tracking branch 'battery/master'
X-Git-Tag: next-20110729~33
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7e17c7e705e67831e86cb7c6d009ee2600d1a9e5;p=karo-tx-linux.git

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

7e17c7e705e67831e86cb7c6d009ee2600d1a9e5