aboutsummaryrefslogtreecommitdiff
path: root/block/cfq-iosched.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.osdl.org>2006-12-12 18:53:48 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-12 18:53:48 -0800
commit445722f97a0ecd3aed3f53d9f0dcaacaef8c6223 (patch)
treed8cbe88303972b282050e4e87a6ea30a3063145f /block/cfq-iosched.c
parent3641b536ecc56f68fe182ac99f7ddc4827125118 (diff)
parentdf3e0d1c69c097f54588d720d39efdcdf31e3c24 (diff)
downloadlinux-2.6.34-ux500-445722f97a0ecd3aed3f53d9f0dcaacaef8c6223.tar.gz
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] kprobe clears qp bits for special instructions [IA64] enable trap code on slot 1 [IA64] Take defensive stance on ia64_pal_get_brand_info() [IA64] fix possible XPC deadlock when disconnecting [IA64] - Reduce overhead of FP exception logging messages [IA64] fix arch/ia64/mm/contig.c:235: warning: unused variable `nid' [IA64] s/termios/ktermios/ in simserial.c [IA64] kexec/kdump: tidy up declaration of relocate_new_kernel_t [IA64] Kexec/Kdump: honour non-zero crashkernel offset. [IA64] CONFIG_KEXEC/CONFIG_CRASH_DUMP permutations [IA64] Do not call SN_SAL_SET_CPU_NUMBER twice on cpu 0
Diffstat (limited to 'block/cfq-iosched.c')
0 files changed, 0 insertions, 0 deletions