From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 19 Jun 2013 04:05:06 +0000 (+1000)
Subject: Merge remote-tracking branch 'battery/master'
X-Git-Tag: next-20130619~46
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=42b3311816df07f22be726f9bf8fe78bcfcdfdde;p=karo-tx-linux.git

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

42b3311816df07f22be726f9bf8fe78bcfcdfdde