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:
37fc67c
7eec77a
)
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
author
Linus Torvalds
<torvalds@linux-foundation.org>
Thu, 21 Apr 2011 17:50:56 +0000
(10:50 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Thu, 21 Apr 2011 17:50:56 +0000
(10:50 -0700)
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
ide: unexport DISK_EVENT_MEDIA_CHANGE for ide-gd and ide-cd
block: don't propagate unlisted DISK_EVENTs to userland
elevator: check for ELEVATOR_INSERT_SORT_MERGE in !elvpriv case too
Trivial merge