From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 20 Feb 2013 02:13:12 +0000 (+1100)
Subject: Merge remote-tracking branch 'dmaengine/next'
X-Git-Tag: next-20130220~69
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=18868dc6f776372cb0742e5d36436bb8220daaa5;p=karo-tx-linux.git

Merge remote-tracking branch 'dmaengine/next'

Conflicts:
	drivers/dma/ioat/dma_v3.c
---

18868dc6f776372cb0742e5d36436bb8220daaa5