diff options
author | Stephen Warren <swarren@nvidia.com> | 2013-12-11 16:39:35 -0700 |
---|---|---|
committer | Stephen Warren <swarren@nvidia.com> | 2013-12-11 16:39:35 -0700 |
commit | 076843e3e8a4fedb480cdad970f7cec25d32c0ab (patch) | |
tree | 2d877277c797d24f094811d99c0c2be9802bdf24 /sound/i2c | |
parent | 4e3ed8cd37d1f80b77f4f2fe27764b83cfcdcd01 (diff) | |
parent | 8010dad55a0ab0e829f3733854e5235eef4e2734 (diff) | |
download | op-kernel-dev-076843e3e8a4fedb480cdad970f7cec25d32c0ab.zip op-kernel-dev-076843e3e8a4fedb480cdad970f7cec25d32c0ab.tar.gz |
Merge branch 'for-3.14/deps-from-dma-of' into for-3.14/dmas-resets-rework
This merges git://git.infradead.org/users/vkoul/slave-dma.git topic/of
Diffstat (limited to 'sound/i2c')
0 files changed, 0 insertions, 0 deletions