Merge branch 'for-3.14/deps-from-dma-defer_probe' into for-3.14/dmas-resets-rework
authorStephen Warren <swarren@nvidia.com>
Wed, 11 Dec 2013 23:38:41 +0000 (16:38 -0700)
committerStephen Warren <swarren@nvidia.com>
Wed, 11 Dec 2013 23:38:41 +0000 (16:38 -0700)
commit4e3ed8cd37d1f80b77f4f2fe27764b83cfcdcd01
tree2f72ff1065f9a4bd694864b690a5220417f16b9a
parent374b105797c3d4f29c685f3be535c35f5689b30e
parent0ad7c00057dc1640647c1dc81ccbd009de17a767
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