projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f4ad9bd
85f2e68
)
Merge branch 'linus' into sched/locking
author
Ingo Molnar
<mingo@elte.hu>
Thu, 14 Apr 2011 06:50:37 +0000
(08:50 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Thu, 14 Apr 2011 06:51:07 +0000
(08:51 +0200)
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>
Trivial merge