diff options
author | Mark Brown <broonie@linaro.org> | 2013-12-12 00:30:04 +0000 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-12-12 00:30:04 +0000 |
commit | e20ab019e28dcf09c2727aa69e2a073ed66718b3 (patch) | |
tree | 1424cb66c3989990d8f2636f8f3d8d40cc65c6a1 /kernel/cgroup.c | |
parent | caa3df8f46bcc083625d0ff2f2ecb560ad72b9f1 (diff) | |
parent | bc567a93502275755492141524935269dcf0ea1b (diff) | |
parent | 5dfc03f141993c101c626c84d639019e98a4f39c (diff) | |
parent | 241bf43321a10815225f477bba96a42285a2da73 (diff) | |
parent | 75704ecfbb4124139b78b71dd603f05d61abe689 (diff) |
Merge remote-tracking branches 'asoc/fix/atmel', 'asoc/fix/fsl', 'asoc/fix/tegra' and 'asoc/fix/wm8962' into asoc-linus