original_kernel/drivers/infiniband
Rusty Russell 2ca1a61583 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:

	arch/x86/kernel/io_apic.c
2008-12-31 23:05:57 +10:30
..
core RDMA/addr: Fix build breakage when IPv6 is disabled 2008-12-29 23:37:14 -08:00
hw Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2008-12-31 23:05:57 +10:30
ulp [SCSI] libiscsi: pass opcode into alloc_pdu callout 2008-12-29 11:24:23 -06:00
Kconfig RDMA/addr: Fix build breakage when IPv6 is disabled 2008-12-29 23:37:14 -08:00
Makefile