diff options
author | Mark Brown <broonie@linaro.org> | 2014-08-04 16:32:18 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-08-04 16:32:18 +0100 |
commit | e99a866c4c6749eb3754e61d43eb18ef32e3556a (patch) | |
tree | 61e52410fea1ac3369868cf1a668803c81746035 /arch/sparc/kernel/pcic.c | |
parent | c5e64c7636eb53495ee79916ca037fb97700eda0 (diff) | |
parent | 3e3e2922c12f29b177b18acc15655186466a92f2 (diff) | |
parent | 563fe71fe76260e32aefc1a2c03f4634c4d5edf9 (diff) | |
parent | 5bca396919aed5fbed61197019824bd3ff9f127d (diff) | |
parent | 8bfcab7c6b44038993fb1a7771ae0ce5d1bf6ea3 (diff) | |
parent | d7821953cfe9803c593a682320468ce2de862803 (diff) |
Merge remote-tracking branches 'asoc/topic/tlv320aic3x', 'asoc/topic/width', 'asoc/topic/wm0010', 'asoc/topic/wm8904' and 'asoc/topic/wm8962' into asoc-next