projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f4ad9bd 85f2e68)
Merge branch 'linus' into sched/locking
authorIngo Molnar <mingo@elte.hu>
Thu, 14 Apr 2011 06:50:37 +0000 (08:50 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 14 Apr 2011 06:51:07 +0000 (08:51 +0200)
commita4c98f8bbeafee12c979c90743f6fda94f7515c7
tree3dda24b8a2ec42ab7b42845cb68c8b6e1b0d501ftree | snapshot
parentf4ad9bd208c98f32a6f9136618e0b8bebe3fb370commit | diff
parent85f2e689a5c8fb6ed8fdbee00109e7f6e5fefcb6commit | diff
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>
John Crispins staging tree