From: Stephen Warren <swarren@nvidia.com>
Date: Wed, 11 Dec 2013 23:38:41 +0000 (-0700)
Subject: Merge branch 'for-3.14/deps-from-dma-defer_probe' into for-3.14/dmas-resets-rework
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4e3ed8cd37d1f80b77f4f2fe27764b83cfcdcd01;p=linux-beck.git

Merge branch 'for-3.14/deps-from-dma-defer_probe' into for-3.14/dmas-resets-rework

This merges git://git.infradead.org/users/vkoul/slave-dma.git topic/defer_probe
---

4e3ed8cd37d1f80b77f4f2fe27764b83cfcdcd01