From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 29 Nov 2011 02:08:51 +0000 (+1100)
Subject: Merge remote-tracking branch 'apm/for-next'
X-Git-Tag: next-20111129~23
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bdde782fc44ea0ff598d185ca7d798497431577f;p=karo-tx-linux.git

Merge remote-tracking branch 'apm/for-next'
---

bdde782fc44ea0ff598d185ca7d798497431577f