diff options
| author | Mark Brown <broonie@kernel.org> | 2015-04-12 14:49:17 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-04-12 14:49:17 -0400 |
| commit | e3438187d2a3b149f5c246ed740df3cf9d4df3d6 (patch) | |
| tree | 538ca0449d467c799608db17f8eb91f4739b43e1 /arch/arm | |
| parent | 1fa1e0731db9e5579afa60b6299b6c47447eee3a (diff) | |
| parent | 261e43a35893830ff32de94443d685c8b9770f5f (diff) | |
| parent | c36aa0a1929a1f0f0b8c374276e49cc663e8f957 (diff) | |
| parent | 1efb53a220b78fdfdbb97b726a2156713e75bdab (diff) | |
Merge remote-tracking branches 'asoc/topic/rt5641', 'asoc/topic/rt5677' and 'asoc/topic/sh-cleanup' into asoc-next