David S. Miller 0d6c4a2e46 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/intel/e1000e/param.c drivers/net/wireless/iwlwifi/iwl-agn-rx.c drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c drivers/net/wireless/iwlwifi/iwl-trans.h Resolved the iwlwifi conflict with mainline using 3-way diff posted by John Linville and Stephen Rothwell. In 'net' we added a bug fix to make iwlwifi report a more accurate skb->truesize but this conflicted with RX path changes that happened meanwhile in net-next. In e1000e a conflict arose in the validation code for settings of adapter->itr. 'net-next' had more sophisticated logic so that logic was used. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-05-07 23:35:40 -04:00
..
addr.c	infiniband: Convert dst_fetch_ha() over to dst_neigh_lookup().	2012-01-25 21:30:36 -05:00
agent.c	IB/mad: Improve an error message so error code is included	2011-03-18 09:42:20 -07:00
agent.h	RDMA: Remove subversion $Id tags	2008-07-14 23:48:44 -07:00
cache.c	IB/core: Add GID change event	2011-07-18 21:04:30 -07:00
cm.c	switch device_get_devnode() and ->devnode() to umode_t *	2012-01-03 22:54:55 -05:00
cm_msgs.h	IB/cm: Fix layout of APR message	2012-01-03 21:04:18 -08:00
cma.c	IB/rdma_cm: TOS <=> UP mapping for IBoE	2012-04-05 05:08:04 -04:00
core_priv.h	IB/core: Allow device-specific per-port sysfs files	2010-05-21 10:34:44 -07:00
device.c	RDMA: Allow for NULL .modify_device() and .modify_port() methods	2011-07-18 16:44:30 -07:00
fmr_pool.c	infiniband: add in export.h for files using EXPORT_SYMBOL/THIS_MODULE	2011-10-31 19:31:35 -04:00
iwcm.c	RDMA/iwcm: Reject connect requests if cmid is not in LISTEN state	2012-03-07 15:14:53 -08:00
iwcm.h	RDMA: iWARP Connection Manager.	2006-09-22 15:22:46 -07:00
mad.c	IB/mad: Don't send response for failed MADs	2012-04-24 16:08:57 -07:00
mad_priv.h	IB/mad: Allow tuning of QP0 and QP1 sizes	2009-09-07 08:28:48 -07:00
mad_rmpp.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
mad_rmpp.h	RDMA: Remove subversion $Id tags	2008-07-14 23:48:44 -07:00
Makefile	RDMA: Add netlink infrastructure	2011-05-20 11:46:11 -07:00
multicast.c	infiniband: add in export.h for files using EXPORT_SYMBOL/THIS_MODULE	2011-10-31 19:31:35 -04:00
netlink.c	infiniband: Stop using NLA_PUT*().	2012-04-02 04:33:42 -04:00
packer.c	infiniband: add in export.h for files using EXPORT_SYMBOL/THIS_MODULE	2011-10-31 19:31:35 -04:00
sa.h	IB: Remove garbage non-ASCII characters from comments	2007-07-09 16:17:32 -07:00
sa_query.c	RDMA: Update missed conversion of flush_scheduled_work()	2011-01-28 16:39:08 -08:00
smi.c	IB/mad: Check hop count field in directed route MAD to avoid array overflow	2009-09-05 20:24:10 -07:00
smi.h	IB/mad: Enable loopback of DR SMP responses from userspace	2008-01-25 14:15:25 -08:00
sysfs.c	IB/core: Don't return EINVAL from sysfs rate attribute for invalid speeds	2012-04-02 10:57:31 -07:00
ucm.c	rdma/core: Fix sparse warnings	2012-01-04 09:17:45 -08:00
ucma.c	net: Convert all sysctl registrations to register_net_sysctl	2012-04-20 21:22:30 -04:00
ud_header.c	infiniband: add in export.h for files using EXPORT_SYMBOL/THIS_MODULE	2011-10-31 19:31:35 -04:00
umem.c	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
user_mad.c	switch device_get_devnode() and ->devnode() to umode_t *	2012-01-03 22:54:55 -05:00
uverbs.h	RDMA/uverbs: Export ib_open_qp() capability to user space	2011-10-13 09:50:56 -07:00
uverbs_cmd.c	RDMA/core: Fix kernel panic by always initializing qp->usecnt	2012-01-27 09:20:10 -08:00
uverbs_main.c	switch device_get_devnode() and ->devnode() to umode_t *	2012-01-03 22:54:55 -05:00
uverbs_marshall.c	infiniband: add in export.h for files using EXPORT_SYMBOL/THIS_MODULE	2011-10-31 19:31:35 -04:00
verbs.c	RDMA/core: Fix kernel panic by always initializing qp->usecnt	2012-01-27 09:20:10 -08:00