kevin/linux
1
Fork 0
Code
4150bbf338
linux/drivers/infiniband/hw/nes
History
David S. Miller 871039f02f Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 
Conflicts:
	drivers/net/stmmac/stmmac_main.c
	drivers/net/wireless/wl12xx/wl1271_cmd.c
	drivers/net/wireless/wl12xx/wl1271_main.c
	drivers/net/wireless/wl12xx/wl1271_spi.c
	net/core/ethtool.c
	net/mac80211/scan.c
2010-04-11 14:53:53 -07:00
..
Kconfig RDMA/nes: Update copyright and branding string 2009-12-09 15:21:56 -08:00
Makefile
nes_cm.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
nes_cm.h RDMA/nes: Fix crash in nes_accept() 2009-12-09 15:54:08 -08:00
nes_context.h RDMA/nes: Update copyright and branding string 2009-12-09 15:21:56 -08:00
nes_hw.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
nes_hw.h RDMA/nes: Clear stall bit before destroying NIC QP 2010-03-11 15:12:15 -08:00
nes_nic.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-04-11 14:53:53 -07:00
nes_user.h RDMA/nes: Update copyright and branding string 2009-12-09 15:21:56 -08:00
nes_utils.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
nes_verbs.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband 2010-04-09 11:53:06 -07:00
nes_verbs.h RDMA/nes: Free kmap() resources 2009-12-09 15:54:28 -08:00
nes.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
nes.h RDMA/nes: Add support for KR device id 0x0110 2010-02-25 10:40:05 -08:00