From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 22 Nov 2011 03:47:06 +0000 (+1100)
Subject: Merge remote-tracking branch 'battery/master'
X-Git-Tag: next-20111122~32
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=be96b22f802b9bdb2346cc3ba715614734a219c4;p=karo-tx-linux.git

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

be96b22f802b9bdb2346cc3ba715614734a219c4