diff options
| author | Alex Shi <alex.shi@linaro.org> | 2018-01-10 10:59:41 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2018-01-10 10:59:41 +0800 |
| commit | 2273228cf26ccc4f6836b57e67defd09c3aede90 (patch) | |
| tree | bdfdf79bbdb5417e3d3dbad8fdcf41a8067f52cd /kernel/locking/mutex.c | |
| parent | 2a72e749b1bfd3870fadf5e16c4708b0778c31c2 (diff) | |
| parent | d79e4dc11891d315311133bc56b7275cf155a304 (diff) | |
Merge remote-tracking branch 'rt-stable/v4.4-rt' into linux-linaro-lsk-v4.4-rt
Conflicts:
arch/arm/include/asm/kvm_arm.h
arch/arm64/mm/init.c
Diffstat (limited to 'kernel/locking/mutex.c')
0 files changed, 0 insertions, 0 deletions