summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-02-09 15:10:24 +0800
committerMark Brown <broonie@kernel.org>2015-02-09 15:10:24 +0800
commitaf70797105f142dfb32cbdedf80e962c025f37ac (patch)
treebd74fe852a6ec79ab83cb082d88f282411ba54be
parent5a7fa6b0d28349d4aa35c6287b9fa186d7224221 (diff)
parent7c47cd7ffd5e8fca28258e6e04207ad154d719e4 (diff)
parentd7c42ff8c34f1c291fcd45c7d56d41aba68c4b13 (diff)
parent3ab888db095518578aac7a13e05f3969531a4f8a (diff)
Merge remote-tracking branches 'asoc/topic/pxa', 'asoc/topic/rcar' and 'asoc/topic/rt286' into asoc-next