From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 21 Apr 2011 17:50:56 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
X-Git-Tag: v2.6.39-rc5~24
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=91e8549bde9e5cc88c5a2e8c8114389279e240b5;p=platform%2Fkernel%2Flinux-3.10.git

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

91e8549bde9e5cc88c5a2e8c8114389279e240b5