original_kernel/drivers/infiniband/hw
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
..
amso1100
cxgb3
ehca cpumask: use new cpumask API in drivers/infiniband/hw/ehca 2008-12-30 09:05:18 +10:30
ipath cpumask: use new cpumask API in drivers/infiniband/hw/ipath 2008-12-30 09:05:18 +10:30
mlx4 IB/mlx4: Fix reading SL field out of cqe->sl_vid 2008-12-30 15:30:26 -08:00
mthca
nes Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2008-12-28 12:49:40 -08:00