David S. Miller 394efd19d5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/emulex/benet/be.h drivers/net/netconsole.c net/bridge/br_private.h Three mostly trivial conflicts. The net/bridge/br_private.h conflict was a function signature (argument addition) change overlapping with the extern removals from Joe Perches. In drivers/net/netconsole.c we had one change adjusting a printk message whilst another changed "printk(KERN_INFO" into "pr_info(". Lastly, the emulex change was a new inline function addition overlapping with Joe Perches's extern removals. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-11-04 13:48:30 -05:00
..
cxgb	net: cxgb2: remove unnecessary pci_set_drvdata()	2013-10-18 00:03:30 -04:00
cxgb3	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-11-04 13:48:30 -05:00
cxgb4	cgxb4: remove duplicate include in cxgb4.h	2013-10-21 18:46:45 -04:00
cxgb4vf	net: cxgb4vf: use DEFINE_PCI_DEVICE_TABLE	2013-10-22 02:19:23 -04:00
Kconfig	cxgb3: Restore dependency on INET	2012-11-28 17:40:59 -05:00
Makefile