Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 10 Jul 2009 21:29:58 +0000 (14:29 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 10 Jul 2009 21:29:58 +0000 (14:29 -0700)
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  cfq-iosched: reset oom_cfqq in cfq_set_request()
  block: fix sg SG_DXFER_TO_FROM_DEV regression
  block: call blk_scsi_ioctl_init()
  Fix congestion_wait() sync/async vs read/write confusion


Trivial merge