You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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>		13 years ago
..
core	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	13 years ago
hw	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	13 years ago
ulp	infiniband: ipoib: Sanitize neighbour handling in ipoib_main.c	13 years ago
Kconfig	RDMA: Add netlink infrastructure	14 years ago
Makefile	IB/qib: Add new qib driver for QLogic PCIe InfiniBand adapters	15 years ago