| commit | 6ab82196492a0b6968a654a06aae923b28afef0d | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jan 14 13:32:07 2011 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jan 14 13:32:07 2011 -0800 |
| tree | 8affe1097bba194fe677d5399f47693dc0363dd8 | |
| parent | 6f7f7caab259026234277b659485d22c1dcb1ab4 [diff] | |
| parent | 49731baa41df404c2c3f44555869ab387363af43 [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: block: restore multiple bd_link_disk_holder() support block cfq: compensate preempted queue even if it has no slice assigned block cfq: make queue preempt work for queues from different workload