| commit | bd4e9a26373331ef6f185500c72a8836eb7c82d9 | [log] [tgz] |
|---|---|---|
| author | Alex Shi <alex.shi@linaro.org> | Thu Jun 25 16:17:21 2015 +0800 |
| committer | Alex Shi <alex.shi@linaro.org> | Thu Jun 25 16:19:06 2015 +0800 |
| tree | 13384e7649be7bb88ab9524efcbc602be85d5020 | |
| parent | 2528dbd348dd541e090594b7aac3f62351078388 [diff] | |
| parent | 2cb9802eeb7f919f97df05b16ec128f4f5af366d [diff] |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-android Conflicts: fs/exec.c Solutions: follow commit d221244a7 sched: move no_new_privs into new atomic flags to use task_no_new_privs(current).