| commit | 72316324660f953a8daee9bf9fcf942f7851b516 | [log] [tgz] |
|---|---|---|
| author | Alex Shi <alex.shi@linaro.org> | Fri Jun 17 16:48:40 2016 +0800 |
| committer | Alex Shi <alex.shi@linaro.org> | Fri Jun 17 16:48:40 2016 +0800 |
| tree | 9028408e487d044ae73ca0121a4af2855070545b | |
| parent | e91b1cc90283c1b9b75670b027a18afbd20fe070 [diff] | |
| parent | 7c0ca54c030093b1d887c432304414d269a9504c [diff] |
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-rt Conflicts: include/linux/cgroup.h compatible with 28f83d2 futex: Handle unlock_pi race gracefull in kernel/futex.c