From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 4 Oct 2011 03:21:06 +0000 (+1100)
Subject: Merge remote-tracking branch 'battery/master'
X-Git-Tag: next-20111004~45
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fc5ed3571384cccb0085fa5d0266b542efc7fd5c;p=karo-tx-linux.git

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

fc5ed3571384cccb0085fa5d0266b542efc7fd5c