]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fe696d1 47330d2)
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)
commit3f19c5b44a32977eca6ee90dfdf69f91e4178268
tree3dda24b8a2ec42ab7b42845cb68c8b6e1b0d501ftree | snapshot
parentfe696d16e84e085b07e874a7d1d44f17256bf17ecommit | diff
parent47330d2334903fadf582810f4281eecb6f319677commit | diff
Merge branch 'linus' into sched/locking

Merge reason: Pick up this upstream commit:

  68d64738e61e: 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>
Linux Kernel Source Tree.