summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-04-12 19:49:17 +0100
committerMark Brown <broonie@kernel.org>2015-04-12 19:49:17 +0100
commite3438187d2a3b149f5c246ed740df3cf9d4df3d6 (patch)
tree538ca0449d467c799608db17f8eb91f4739b43e1
parent1fa1e0731db9e5579afa60b6299b6c47447eee3a (diff)
parent261e43a35893830ff32de94443d685c8b9770f5f (diff)
parentc36aa0a1929a1f0f0b8c374276e49cc663e8f957 (diff)
parent1efb53a220b78fdfdbb97b726a2156713e75bdab (diff)
downloadlinux-e3438187d2a3b149f5c246ed740df3cf9d4df3d6.tar.bz2
Merge remote-tracking branches 'asoc/topic/rt5641', 'asoc/topic/rt5677' and 'asoc/topic/sh-cleanup' into asoc-next