diff options
author | Mark Brown <broonie@kernel.org> | 2014-12-08 13:11:54 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-12-08 13:11:54 +0000 |
commit | b39af5b38d04008d289b9993f327eb54a0470200 (patch) | |
tree | f50d61ba58689ed84d6699b4576911fb3fd52b35 /security/selinux/netif.c | |
parent | cfdf59b4a157b3ffa123073cc9e2a62febdbafbf (diff) | |
parent | fd587e320041d42eb21d12bb62da9e8ac08fd6c2 (diff) | |
parent | c973b8a7dc50ace86393f209b19aa7fd0bfaf66b (diff) | |
parent | ceb3c0683cfc5dcc2b627985143105f6dfb0b324 (diff) | |
parent | 6e2793b98e23372cc80d9b5d981ab2467e90acea (diff) |
Merge remote-tracking branches 'asoc/topic/cs4265', 'asoc/topic/cs4271', 'asoc/topic/cs42l51' and 'asoc/topic/cs42l73' into asoc-next