tree f592738f7d3f1ed1640f28db6c2b987fc826ba65
parent c4888f9ffafe7db107b7eafb3a68eaeeff3779c3
parent 2ad8b1ef11c98c5603580878aebf9f1bc74129e4
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1194650269 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1194650269 -0800

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

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  Add UNPLUG traces to all appropriate places
  block: fix requeue handling in blk_queue_invalidate_tags()
  mmc: Fix sg helper copy-and-paste error
  pktcdvd: fix BUG caused by sysfs module reference semantics change
  ioprio: allow sys_ioprio_set() value of 0 to reset ioprio setting
  cfq_idle_class_timer: add paranoid checks for jiffies overflow
  cfq: fix IOPRIO_CLASS_IDLE delays
  cfq: fix IOPRIO_CLASS_IDLE accounting