diff options
| author | Stephen Warren <swarren@nvidia.com> | 2013-12-11 16:38:41 -0700 |
|---|---|---|
| committer | Stephen Warren <swarren@nvidia.com> | 2013-12-11 16:38:41 -0700 |
| commit | 4e3ed8cd37d1f80b77f4f2fe27764b83cfcdcd01 (patch) | |
| tree | 2f72ff1065f9a4bd694864b690a5220417f16b9a /COPYING | |
| parent | 374b105797c3d4f29c685f3be535c35f5689b30e (diff) | |
| parent | 0ad7c00057dc1640647c1dc81ccbd009de17a767 (diff) | |
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
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions