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)
commitc1864cfb80a64933c221e33fed9611356c031944
treeda718033bf04a78b927f10d2d63525abbbae77e9
parent9b97b84eb51e689b90960916e7c2f57f4790f17f
parentda2e852612967a53d17de930929574444a67fb52
Merge git://git./linux/kernel/git/davem/net
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