diff options
| author | Ingo Molnar | 2017-06-13 08:47:22 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2017-06-13 08:47:22 +0200 |
| commit | 3f365cf304ba3d316b3df2474af8d7df6edd2455 (patch) | |
| tree | bb52465b35606bec268e9c1b88c746f8caf0f919 /arch/x86/platform/olpc/olpc-xo1-pm.c | |
| parent | x86/ldt: Rename ldt_struct::size to ::nr_entries (diff) | |
| parent | sched/core: Idle_task_exit() shouldn't use switch_mm_irqs_off() (diff) | |
| download | kernel-qcow2-linux-3f365cf304ba3d316b3df2474af8d7df6edd2455.tar.gz kernel-qcow2-linux-3f365cf304ba3d316b3df2474af8d7df6edd2455.tar.xz kernel-qcow2-linux-3f365cf304ba3d316b3df2474af8d7df6edd2455.zip | |
Merge branch 'sched/urgent' into x86/mm, to pick up dependent fix
Andy will need the following scheduler fix for the PCID series:
252d2a4117bc: sched/core: Idle_task_exit() shouldn't use switch_mm_irqs_off()
So do a cross-merge.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/platform/olpc/olpc-xo1-pm.c')
0 files changed, 0 insertions, 0 deletions