diff options
author | Kevin Hilman <khilman@linaro.org> | 2015-05-22 14:08:20 -0700 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2015-05-22 14:08:20 -0700 |
commit | a61d3b775855a1d67d97ca0aa389489cb8a9320d (patch) | |
tree | 601436cafe7fb44be336310b47b05bbe8b04de77 /sound/arm | |
parent | f97bd9e5fccad66301a486309aba96e4188a9310 (diff) | |
parent | 28abe338d1e21160ac73ca610f5e202ef7787f7b (diff) |
Merge branch 'v3.18/topic/configs' into linux-linaro-lsk-v3.18
* v3.18/topic/configs:
linaro/configs: preempt-rt: remove SLUB setting
linaro/configs: remove android.conf, not used
Diffstat (limited to 'sound/arm')
0 files changed, 0 insertions, 0 deletions