aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-02-27 20:26:08 +0900
committerMark Brown <broonie@linaro.org>2014-02-27 20:26:08 +0900
commit2f23db13df253485329a73233cded8a022668a48 (patch)
treec46c0d1688df0209539b0f256c03bb3133ff7862 /include
parentf3cfc7d96986a2c94061650b4bccfec53bc588fe (diff)
parent75306820248e26d15d84acf4e297b9fb27dd3bb2 (diff)
parentb3619b288b621e63f66908045f48495869a996a6 (diff)
downloadlinux-linaro-stable-2f23db13df253485329a73233cded8a022668a48.tar.gz
Merge remote-tracking branches 'asoc/fix/da732x' and 'asoc/fix/sta32x' into asoc-linus