summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-sa1100/collie.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-08-04 16:32:07 +0100
committerMark Brown <broonie@linaro.org>2014-08-04 16:32:07 +0100
commit3510a6949546901cc97fd057e9c74975257375d2 (patch)
treec615eb2b66d75ec205e2817b2f4303d16da92ad2 /arch/arm/mach-sa1100/collie.c
parentc1bd940afdba6d8d6a0a2219cf6ae9dafc7ef0a9 (diff)
parent2488708f5c13e7bcb884dbb31b767e314ea80016 (diff)
parentc8448051a5e7fda464486eaf5a4ef0c5b6d96673 (diff)
parent294e8a75a19623c3d8a3b7f692d3b869932c7f8f (diff)
parentc62f9d8f7fcefe87e362b75c1c6a4333fc1019ac (diff)
parentc46af3124b05ccb37d1311e442f191bb5c1d888e (diff)
Merge remote-tracking branches 'asoc/topic/sigmadsp', 'asoc/topic/sirf', 'asoc/topic/spdif', 'asoc/topic/tas2552' and 'asoc/topic/tas5086' into asoc-next