diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-05 09:27:05 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-05 09:27:05 +0200 |
| commit | 8bc39bca5e3e8da0d62f7f4d67fdbeecab02b350 (patch) | |
| tree | ac5df85133c64167381acb33086e154724148dc2 /arch/mips/kernel/perf_event.c | |
| parent | 094094a9373fbea80ec00714eed5c24f6fd39ecf (diff) | |
| parent | 3c2993b8c6143d8a5793746a54eba8f86f95240f (diff) | |
Merge 4.12-rc4 into tty-next
We want the tty locking fix in here, so that maybe we can finally get it
fixed for real...
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/mips/kernel/perf_event.c')
0 files changed, 0 insertions, 0 deletions