From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 14 Nov 2011 01:11:52 +0000 (+1100)
Subject: Merge remote-tracking branch 'battery/master'
X-Git-Tag: next-20111114~26
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0aec962a76f32da16272f90c7c691348a7aba3a2;p=karo-tx-linux.git

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

0aec962a76f32da16272f90c7c691348a7aba3a2