tree 3dda24b8a2ec42ab7b42845cb68c8b6e1b0d501f
parent f4ad9bd208c98f32a6f9136618e0b8bebe3fb370
parent 85f2e689a5c8fb6ed8fdbee00109e7f6e5fefcb6
author Ingo Molnar <mingo@elte.hu> 1302763837 +0200
committer Ingo Molnar <mingo@elte.hu> 1302763867 +0200

Merge branch 'linus' into sched/locking

Merge reason: Pick up this upstream commit:

  6631e635c65d: block: don't flush plugged IO on forced preemtion scheduling

As it modifies the scheduler and we'll queue up dependent patches.

Signed-off-by: Ingo Molnar <mingo@elte.hu>