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

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

16c39e3b02899e4f74310f38aaa3fa2a3f0f5d10