From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 7 Dec 2011 02:22:41 +0000 (+1100)
Subject: Merge remote-tracking branch 'battery/master'
X-Git-Tag: next-20111207~40
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=59c579db00789903830f1d05902b19032fd1a087;p=karo-tx-linux.git

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

59c579db00789903830f1d05902b19032fd1a087