diff options
author | Mark Brown <broonie@kernel.org> | 2016-03-05 15:26:33 +0300 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-03-05 15:26:33 +0300 |
commit | 92e9f77306e3dddb707ae744333ea204c9727bac (patch) | |
tree | 30076e685818229b934894a0703896ab820e80af /drivers/net/ethernet/cavium/liquidio/octeon_droq.c | |
parent | 6374fda1472524deaa492da1ce0adca600343996 (diff) | |
parent | 4b606316129571c46381430852c149855ac50477 (diff) | |
parent | 7c139db2e579669c3313f92d2dd2256b255fcc07 (diff) | |
parent | 15c665700bf6f4543f003ac0fbb1e9ec692e93f2 (diff) | |
parent | 89300b4e5a5b5b5c145318f3b257291239522da6 (diff) | |
parent | fe9aba13108ee8e15ae59009a26db02460dbb04f (diff) | |
parent | 56e5fd8feb286ab71f4ca7674505b0d17967376d (diff) | |
download | linux-92e9f77306e3dddb707ae744333ea204c9727bac.tar.xz |
Merge remote-tracking branches 'asoc/fix/ab8500', 'asoc/fix/adau17x1', 'asoc/fix/adsp', 'asoc/fix/cs42l51', 'asoc/fix/da732x' and 'asoc/fix/fsl-ssi' into asoc-linus