From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 14 Oct 2011 02:48:31 +0000 (+1100)
Subject: Merge remote-tracking branch 'battery/master'
X-Git-Tag: next-20111014~49
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9f76be659584814b4c00641eb4879e41b77feafb;p=karo-tx-linux.git

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

9f76be659584814b4c00641eb4879e41b77feafb