diff options
| author | Mark Brown <broonie@kernel.org> | 2014-10-06 12:49:09 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-06 12:49:09 +0100 |
| commit | a5448c88b812390a3622e76d774e10c0da1fb970 (patch) | |
| tree | 40f87e20d02f7c34f9cad5399c220cb81af20af0 /security/keys/compat.c | |
| parent | 978d4ddb9ed2fe272d66219e109afe6e8eb090a9 (diff) | |
| parent | ff495d3a8ea4d46d237096e6521b24b7ba612e53 (diff) | |
| parent | 77c545398e33a0263a68142fcfbd4b11b0f06294 (diff) | |
| parent | dfe8f1f3f22f9922e773ae64f5621f290cb26023 (diff) | |
Merge remote-tracking branches 'asoc/topic/txx9', 'asoc/topic/wm8978' and 'asoc/topic/wm8994' into asoc-next