From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 28 Jun 2013 04:08:05 +0000 (+1000)
Subject: Merge remote-tracking branch 'battery/master'
X-Git-Tag: next-20130628~50
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9776afcf1a53729cada9e8bfdfe5cc1d2a31b6ff;p=karo-tx-linux.git

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

9776afcf1a53729cada9e8bfdfe5cc1d2a31b6ff