David S. Miller abb434cb05 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/bluetooth/l2cap_core.c Just two overlapping changes, one added an initialization of a local variable, and another change added a new local variable. Signed-off-by: David S. Miller <davem@davemloft.net>		2011-12-23 17:13:56 -05:00
..
core	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2011-12-23 17:13:56 -05:00
hw	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2011-12-23 17:13:56 -05:00
ulp	infiniband: ipoib: Sanitize neighbour handling in ipoib_main.c	2011-12-05 15:20:20 -05:00
Kconfig	RDMA: Add netlink infrastructure	2011-05-20 11:46:11 -07:00
Makefile	IB/qib: Add new qib driver for QLogic PCIe InfiniBand adapters	2010-05-23 21:44:54 -07:00