diff options
author | Mark Brown <broonie@kernel.org> | 2015-03-16 12:03:15 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-03-16 12:03:15 +0000 |
commit | af6b7a82fd2416d68bcf46d18d96de9b59e43b06 (patch) | |
tree | 79339a32b61772f5a3c8b3eeb5072257a9c6f1b3 | |
parent | 016e81f2029cd89fcf71bd6324cb0eda9c56ec5d (diff) | |
parent | ce9594c6b332fd6fe464e22a83b0e6e0a287aac6 (diff) | |
parent | 87a8b286e2f63c048a586dc677140d4a5b5808aa (diff) | |
parent | 8e6a75c102f8e232b599a06e06731d8c5d5f2c5d (diff) | |
parent | 6c8ca30eec7b6f8eb09c957e8dcced89e5f100c7 (diff) | |
parent | 34e81ab4556f3b1371763861e74e3600818924b5 (diff) | |
parent | a4ee556137a5bb4b542c5023e6fead4b7cf33495 (diff) | |
download | lwn-af6b7a82fd2416d68bcf46d18d96de9b59e43b06.tar.gz lwn-af6b7a82fd2416d68bcf46d18d96de9b59e43b06.zip |
Merge remote-tracking branches 'asoc/fix/ak4671', 'asoc/fix/control', 'asoc/fix/da732x', 'asoc/fix/fsl-ssi', 'asoc/fix/lock' and 'asoc/fix/rt286' into asoc-linus