David S. Miller 49997d7515 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 ... Conflicts: Documentation/powerpc/booting-without-of.txt drivers/atm/Makefile drivers/net/fs_enet/fs_enet-main.c drivers/pci/pci-acpi.c net/8021q/vlan.c net/iucv/iucv.c		2008-07-18 02:39:39 -07:00
..
ipoib_cm.c	IPoIB/cm: Reduce connected mode TX object size	2008-07-14 23:48:52 -07:00
ipoib_ethtool.c	IPoIB: add LRO support	2008-07-14 23:48:48 -07:00
ipoib_fs.c	RDMA: Remove subversion $Id tags	2008-07-14 23:48:44 -07:00
ipoib_ib.c	IPoIB: Refresh paths instead of flushing them on SM change events	2008-07-14 23:48:49 -07:00
ipoib_main.c	IPoIB: Remove priv->mcast_mutex	2008-07-14 23:48:50 -07:00
ipoib_multicast.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2008-07-18 02:39:39 -07:00
ipoib_verbs.c	IPoIB: Get rid of ipoib_mcast_detach() wrapper	2008-07-14 23:48:50 -07:00
ipoib_vlan.c	RDMA: Remove subversion $Id tags	2008-07-14 23:48:44 -07:00
ipoib.h	IPoIB: Double default RX/TX ring sizes	2008-07-14 23:48:52 -07:00
Kconfig	IPoIB: add LRO support	2008-07-14 23:48:48 -07:00
Makefile	IPoIB: Add basic ethtool support	2008-04-16 21:09:32 -07:00