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

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

7da380b36ab9cf060e1eac3d2c2e757de906da48