From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 7 Nov 2012 00:34:21 +0000 (+1100)
Subject: Merge remote-tracking branch 'slave-dma/next'
X-Git-Tag: next-20121107~70
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=e731837a19a2631a7fb666af6e79f20300809d10;p=karo-tx-linux.git

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

e731837a19a2631a7fb666af6e79f20300809d10