tree 5d5432c2a8a066ecf92e0eec9f07e8b96a6be198
parent 37fc67c9f0454f7a6448d87225cfee8067fd731d
parent 7eec77a1816a7042591a6cbdb4820e9e7ebffe0e
author Linus Torvalds <torvalds@linux-foundation.org> 1303408256 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1303408256 -0700

Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

* '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