Merge branch 'sched/core' into locking/core
authorThomas Gleixner <tglx@linutronix.de>
Tue, 4 Apr 2017 09:31:12 +0000 (11:31 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Tue, 4 Apr 2017 09:31:12 +0000 (11:31 +0200)
Required for the rtmutex/sched_deadline patches which depend on both
branches

1  2 
mm/percpu.c

diff --cc mm/percpu.c
Simple merge