diff options
| author | Mark Brown <broonie@kernel.org> | 2015-09-23 21:01:12 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-09-23 21:01:12 +0300 |
| commit | ed14ee0eea8b6808025356cecc87a8007885263f (patch) | |
| tree | 412d79e2c2d5a302c37daa0eb3866ed64ddd23e6 /net/unix/sysctl_net_unix.c | |
| parent | d86a2fe4dc97cbbad04f5db941d9a1bb82e22b5f (diff) | |
| parent | 8524bb0c7ac688a3cd6ba12dae6104c54d0566b9 (diff) | |
| parent | ee92cfb030c16ddb01f6543968f13bcb61ed9da5 (diff) | |
| download | linux-ed14ee0eea8b6808025356cecc87a8007885263f.tar.xz | |
Merge remote-tracking branches 'asoc/fix/wm8960' and 'asoc/fix/wm8962' into asoc-linus