David S. Miller dda922c831 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/phy/amd-xgbe-phy.c drivers/net/wireless/iwlwifi/Kconfig include/net/mac80211.h iwlwifi/Kconfig and mac80211.h were both trivial overlapping changes. The drivers/net/phy/amd-xgbe-phy.c file got removed in 'net-next' and the bug fix that happened on the 'net' side is already integrated into the rest of the amd-xgbe driver. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-06-01 22:51:30 -07:00
..
ehea	ehea: Fix memory hook reference counting crashes	2015-04-25 14:33:04 -04:00
emac	net/ibm/emac: fix size of emac dump memory areas	2015-05-25 16:38:55 -04:00
ibmveth.c	ibmveth: Add support for Large Receive Offload	2015-04-30 16:33:46 -04:00
ibmveth.h	ibmveth: Add support for Large Receive Offload	2015-04-30 16:33:46 -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