summaryrefslogtreecommitdiffstats
path: root/arch/ia64/kernel/smpboot.c
diff options
context:
space:
mode:
authorLinus Torvalds2006-01-05 03:44:12 +0100
committerLinus Torvalds2006-01-05 03:44:12 +0100
commitdb9edfd7e339ca4113153d887e782dd05be5a9eb (patch)
tree0a4ba12447a0cabc800adc7e9667d284777b0181 /arch/ia64/kernel/smpboot.c
parent[PATCH] i386: "invalid operand" -> "invalid opcode" (diff)
parent[PATCH] net: swich device attribute creation to default attrs (diff)
downloadkernel-qcow2-linux-db9edfd7e339ca4113153d887e782dd05be5a9eb.tar.gz
kernel-qcow2-linux-db9edfd7e339ca4113153d887e782dd05be5a9eb.tar.xz
kernel-qcow2-linux-db9edfd7e339ca4113153d887e782dd05be5a9eb.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
Trivial manual merge fixup for usb_find_interface clashes.
Diffstat (limited to 'arch/ia64/kernel/smpboot.c')
0 files changed, 0 insertions, 0 deletions