From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 10 Sep 2012 02:55:59 +0000 (+1000)
Subject: Merge remote-tracking branch 'battery/master'
X-Git-Tag: next-20120910~50
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5a2fb4eb8384900535221c03128b4fddbfd1b537;p=karo-tx-linux.git

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

5a2fb4eb8384900535221c03128b4fddbfd1b537