David S. Miller 17f7f4d9fc Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: net/ipv4/fib_frontend.c		2010-12-26 22:37:05 -08:00
..
addr.c	infiniband: remove dev_base_lock use	2010-11-24 11:41:56 -08:00
agent.c	IB/mad: IBoE supports only QP1 (no QP0)	2010-10-13 09:38:11 -07:00
agent.h
cache.c
cm.c	IB/cm: Check LAP state before sending an MRA	2010-07-28 15:18:24 -07:00
cm_msgs.h
cma.c	IB/core: Add VLAN support for IBoE	2010-10-25 10:20:39 -07:00
core_priv.h	IB/core: Allow device-specific per-port sysfs files	2010-05-21 10:34:44 -07:00
device.c	IB/core: Allow device-specific per-port sysfs files	2010-05-21 10:34:44 -07:00
fmr_pool.c
iwcm.c	RDMA/iwcm: Fix hang in uninterruptible wait on cm_id destroy	2010-10-11 20:24:04 -07:00
iwcm.h
mad.c	IB/mad: IBoE supports only QP1 (no QP0)	2010-10-13 09:38:11 -07:00
mad_priv.h
mad_rmpp.c
mad_rmpp.h
Makefile
multicast.c	IB/mad: IBoE supports only QP1 (no QP0)	2010-10-13 09:38:11 -07:00
packer.c
sa.h
sa_query.c	RDMA/cm: Add RDMA CM support for IBoE devices	2010-10-13 15:46:43 -07:00
smi.c
smi.h
sysfs.c	IB/core: Add link layer type information to sysfs	2010-10-25 10:20:39 -07:00
ucm.c	IB/ucm: Use memdup_user()	2010-05-25 21:10:57 -07:00
ucma.c	Merge branches 'amso1100', 'cma', 'cxgb3', 'cxgb4', 'ehca', 'iboe', 'ipoib', 'misc', 'mlx4', 'nes', 'qib' and 'srp' into for-next	2010-10-26 16:09:11 -07:00
ud_header.c	IB/pack: Remove some unused code added by the IBoE patches	2010-12-01 16:30:18 -08:00
umem.c
user_mad.c	IB/umad: Make user_mad semaphore a real one	2010-09-28 20:52:21 -07:00
uverbs.h
uverbs_cmd.c	IB/uverbs: Handle large number of entries in poll CQ	2010-12-08 15:23:49 -08:00
uverbs_main.c	IB: Explicitly rule out llseek to avoid BKL in default_llseek()	2010-04-21 12:17:38 -07:00
uverbs_marshall.c	IB: Fix information leak in marshalling code	2010-12-01 16:33:18 -08:00
verbs.c	IB/core: Add link layer property to ports	2010-09-27 17:51:10 -07:00