summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-06-03 10:39:38 +0100
committerMark Brown <broonie@linaro.org>2014-06-03 10:39:38 +0100
commitbad6f621e492f65a0bf0fbe8db1c9c7f20da6a60 (patch)
tree93e1649e45919a7b39675a9feefd321685d8c903
parentcee429e5c53f7ffc1dd500001d9dff567833c23d (diff)
parent4c715c758c72ec5885ccfadf4e98ca76262ba619 (diff)
parente6c111fac4464e3f4bf7b3802b517dafc80f8e0f (diff)
Merge remote-tracking branches 'asoc/fix/pxa' and 'asoc/fix/tlv320aic3x' into asoc-linus