From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 13 Dec 2013 02:00:29 +0000 (+1100)
Subject: Merge remote-tracking branch 'battery/master'
X-Git-Tag: next-20131213~37
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2ba8ab4bfb20f67d04d2739371f2da139b2984a1;p=karo-tx-linux.git

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

2ba8ab4bfb20f67d04d2739371f2da139b2984a1