OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
08150c5
49cac01
)
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
author
Linus Torvalds
<torvalds@linux-foundation.org>
Sat, 16 Apr 2011 17:33:41 +0000
(10:33 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Sat, 16 Apr 2011 17:33:41 +0000
(10:33 -0700)
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
block: make unplug timer trace event correspond to the schedule() unplug
block: let io_schedule() flush the plug inline
Trivial merge