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
..
ehea	drivers/net/ethernet/ibm/ehea/ehea_main.c: add alias entry for portN properties	2013-09-16 21:29:10 -04:00
emac	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-11-04 13:48:30 -05:00
ibmveth.c	net:drivers/net: Miscellaneous conversions to ETH_ALEN	2013-10-02 17:04:45 -04:00
ibmveth.h	ibmveth: Fix little endian issues	2013-09-04 00:27:27 -04:00
Kconfig	ibm-ethernet: delete stale MCA and duplicate PSERIES dependency	2013-06-03 00:24:31 -07:00
Makefile	net: powerpc: remove the legacy iSeries ethernet driver	2012-03-09 23:41:26 -05:00