| commit | a44038112d3379f49df8a9db3e1259d9e945faee | [log] [tgz] |
|---|---|---|
| author | Anders Roxell <anders.roxell@linaro.org> | Wed Aug 10 12:11:15 2016 +0200 |
| committer | Anders Roxell <anders.roxell@linaro.org> | Wed Aug 10 12:11:15 2016 +0200 |
| tree | 198f8ef7dcba389b87dbd3cac861d896b5bfd77d | |
| parent | 590e935df0c94b2d7a4584bb26906666176a6133 [diff] | |
| parent | 0e790100f1c49f32a390d0cc55801230fd04ba56 [diff] |
Merge remote-tracking branch 'lsk/linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-rt Signed-off-by: Anders Roxell <anders.roxell@linaro.org> Conflicts: kernel/futex.c kernel/printk/printk.c kernel/softirq.c mm/slub.c mm/swap.c