| commit | 69ca06c9454169c4a9303e8834adae9080f94859 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jul 10 14:29:58 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jul 10 14:29:58 2009 -0700 |
| tree | d713fe8ac3ada06c0989706e237f6e6176396347 | |
| parent | 9f2d8be4266f8861af806d964ae5db2949b670f3 [diff] | |
| parent | 32f2e807a3938b24d0831211e6094f9e44b2fc83 [diff] |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block * '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