From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 12 Sep 2011 03:38:46 +0000 (+1000)
Subject: Merge remote-tracking branch 'battery/master'
X-Git-Tag: next-20110912~43
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2efaa80a043ae90bea4c0b673997d03cc57b828b;p=karo-tx-linux.git

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

2efaa80a043ae90bea4c0b673997d03cc57b828b