summaryrefslogtreecommitdiff
path: root/block/cfq-iosched.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-10-31 08:10:03 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-31 08:10:03 -0800
commiteafa6cb18ec7e5424ce54017b5ce6d11dff58b79 (patch)
treed930417cd7d252fe171663aecd9229d19d42aa99 /block/cfq-iosched.c
parent612b322ade7954a1d984fa410a70d4ae50f75c0d (diff)
parent4731f2dfd5049b7a2b3b5a7131525f6151855f0d (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6: sh: Titan defconfig update. sh: Fix IPR-IRQ's for IRQ-chip change breakage. sh: Update r7780rp_defconfig. video: Fix include in hp680_bl. sh: Wire up new syscalls.
Diffstat (limited to 'block/cfq-iosched.c')
0 files changed, 0 insertions, 0 deletions