From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 12 Sep 2011 02:58:15 +0000 (+1000)
Subject: Merge remote-tracking branch 'slave-dma/next'
X-Git-Tag: next-20110912~56
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ac30a4bc171f3a1bb80ded565cf6dc40ee156585;p=karo-tx-linux.git

Merge remote-tracking branch 'slave-dma/next'
---

ac30a4bc171f3a1bb80ded565cf6dc40ee156585