David S. Miller 4b87f92259 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: Documentation/networking/ip-sysctl.txt drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c Both conflicts were simply overlapping context. A build fix for qlcnic is in here too, simply removing the added devinit annotations which no longer exist. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-01-15 15:05:59 -05:00
..
Kconfig	net: Remove bogus dependencies on INET	2012-11-19 19:13:59 -05:00
Makefile	be2net: Add functionality to support RoCE driver	2012-05-08 11:17:47 -07:00
be.h	be2net: fix unconditionally returning IRQ_HANDLED in INTx	2013-01-12 15:33:01 -08:00
be_cmds.c	be2net: fix be_close() to ensure all events are ack'ed	2012-12-18 16:18:39 -08:00
be_cmds.h	be2net: fix wrong usage of adapter->generation	2012-11-07 16:59:52 -05:00
be_ethtool.c	ethtool: fix drvinfo strings set in drivers	2013-01-06 21:06:31 -08:00
be_hw.h	be2net: fix access to SEMAPHORE reg	2012-11-07 16:59:52 -05:00
be_main.c	be2net: fix unconditionally returning IRQ_HANDLED in INTx	2013-01-12 15:33:01 -08:00
be_roce.c	be2net: remove roce on lancer	2012-11-07 16:59:52 -05:00
be_roce.h	be2net: Add functionality to support RoCE driver	2012-05-08 11:17:47 -07:00