Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Wed, 6 Jun 2012 22:06:41 +0000 (15:06 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 6 Jun 2012 22:06:41 +0000 (15:06 -0700)
1  2 
drivers/net/ethernet/marvell/mv643xx_eth.c
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
drivers/net/hyperv/netvsc.c
drivers/net/wireless/mwifiex/cfg80211.c

Simple merge