Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block latest
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 May 2011 13:49:02 +0000 (06:49 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 May 2011 13:49:02 +0000 (06:49 -0700)
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  block: don't delay blk_run_queue_async
  scsi: remove performance regression due to async queue run
  blk-throttle: Use task_subsys_state() to determine a task's blkio_cgroup
  block: rescan partitions on invalidated devices on -ENOMEDIA too
  cdrom: always check_disk_change() on open
  block: unexport DISK_EVENT_MEDIA_CHANGE for legacy/fringe drivers

1  2 
drivers/scsi/scsi_lib.c

Simple merge