diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-14 21:32:07 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-14 21:32:07 (GMT) |
commit | 6ab82196492a0b6968a654a06aae923b28afef0d (patch) | |
tree | 8affe1097bba194fe677d5399f47693dc0363dd8 /drivers/acpi | |
parent | 6f7f7caab259026234277b659485d22c1dcb1ab4 (diff) | |
parent | 49731baa41df404c2c3f44555869ab387363af43 (diff) | |
download | linux-fsl-qoriq-6ab82196492a0b6968a654a06aae923b28afef0d.tar.xz |
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
Diffstat (limited to 'drivers/acpi')
0 files changed, 0 insertions, 0 deletions