]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Sun, 19 Feb 2012 21:03:15 +0000 (16:03 -0500)
committerDavid S. Miller <davem@davemloft.net>
Sun, 19 Feb 2012 21:03:15 +0000 (16:03 -0500)
commitad167c478c502c5a113be657e57bd3fd97a910f7
tree40a88e6bae4e797cafce33f16a25e350c038f9bb
parent3279dd5f75e11a9253505352259d4b489c4c362a
parent321a767d01de16896a7e28edab521f81c20e6c60
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c

Small minor conflict in bnx2x, wherein one commit changed how
statistics were stored in software, and another commit
fixed endianness bugs wrt. reading the values provided by
the chip in memory.

Signed-off-by: David S. Miller <davem@davemloft.net>
13 files changed:
drivers/net/ethernet/3com/3c59x.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
drivers/net/ethernet/freescale/fec.c
drivers/net/ethernet/micrel/ks8851.c
drivers/net/ethernet/micrel/ks8851_mll.c
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
drivers/net/ethernet/ti/cpmac.c
drivers/net/veth.c
drivers/net/wireless/rtlwifi/pci.c
net/core/netpoll.c
net/mac80211/main.c