diff options
| author | Jon Medhurst <tixy@linaro.org> | 2015-08-04 16:13:55 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2015-08-04 16:13:55 +0100 |
| commit | 611ee64d3560a082b41f74fc3921cbe42be951ba (patch) | |
| tree | 8e27b7619064cf5cbeb2db3ce6983ab7bdb2fcfe /kernel/cgroup.c | |
| parent | b08ba4cdea50ace8a6752f4618b4c1270cc5f73e (diff) | |
| parent | ff9c905471b0e3bf0755f7673dcad62e3c678a9f (diff) | |
Merge branch 'lsk-3.10-armlt-mali' into integration-lsk-3.10-juno-android
Conflicts:
linaro/configs/vexpress64.conf
Diffstat (limited to 'kernel/cgroup.c')
0 files changed, 0 insertions, 0 deletions