tree e36762d385bb490914a72485c4da4431e4b937d3
parent 2e9521fd656f05a716b5294a7dbebd37ced05e43
parent 3ec717b7ca4ee1d75d77e4f6286430d8f01d1dbd
author Linus Torvalds <torvalds@linux-foundation.org> 1305726542 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1305726542 -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:
  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