David S. Miller a210576cf8 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/mac80211/sta_info.c net/wireless/core.h Two minor conflicts in wireless. Overlapping additions of extern declarations in net/wireless/core.h and a bug fix overlapping with the addition of a boolean parameter to __ieee80211_key_free(). Signed-off-by: David S. Miller <davem@davemloft.net>		2013-04-01 13:36:50 -04:00
..
Kconfig	mv643xx_eth: convert to use the Marvell Orion MDIO driver	2013-03-22 10:25:15 -04:00
Makefile	mv643xx_eth: convert to use the Marvell Orion MDIO driver	2013-03-22 10:25:15 -04:00
mv643xx_eth.c	mv643xx_eth: defer probing if Marvell Orion MDIO driver not loaded	2013-03-24 17:07:15 -04:00
mvmdio.c	net: mvmdio: define module alias for platform device	2013-03-24 17:07:15 -04:00
mvneta.c	drivers:net: Remove dma_alloc_coherent OOM messages	2013-03-15 08:56:58 -04:00
pxa168_eth.c	drivers:net: dma_alloc_coherent: use __GFP_ZERO instead of memset(, 0)	2013-03-17 12:50:24 -04:00
skge.c	ethernet: Remove unnecessary alloc/OOM messages, alloc cleanups	2013-02-04 13:22:33 -05:00
skge.h
sky2.c	sky2: Threshold for Pause Packet is set wrong	2013-03-29 14:53:19 -04:00
sky2.h	sky2: Receive Overflows not counted	2013-03-29 14:53:19 -04:00