From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 8 Jan 2014 02:36:51 +0000 (+1100)
Subject: Merge remote-tracking branch 'battery/master'
X-Git-Tag: next-20140108~40
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=184f8fa4207c8bebef871f0b2cf0e4b3f8e8a892;p=karo-tx-linux.git

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

184f8fa4207c8bebef871f0b2cf0e4b3f8e8a892