From: Ingo Molnar Date: Thu, 14 Apr 2011 06:50:37 +0000 (+0200) Subject: Merge branch 'linus' into sched/locking X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a4c98f8bbeafee12c979c90743f6fda94f7515c7;p=linux-beck.git 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 --- a4c98f8bbeafee12c979c90743f6fda94f7515c7