diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-11-02 17:32:54 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-11-02 17:32:54 +0100 |
| commit | 615240e75926a656ac1c6b118ee8a7babc35142d (patch) | |
| tree | 506fc67e9c1eb403905d30f81f809b542f30a952 /localversion-rt | |
| parent | 94666f64985e7b83f2af0b03a7849686d2590103 (diff) | |
| parent | 10f9e3bce7f3ab7ab4d09a9b78c7208c9a1455f7 (diff) | |
Merge branch 'linux-4.1.y' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-4.1.y-rt
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Conflicts:
arch/x86/include/asm/preempt.h
include/linux/sched.h
Diffstat (limited to 'localversion-rt')
0 files changed, 0 insertions, 0 deletions