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

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

cec4212a8ce03db5d0ec43ca037c114fae754b2a