]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 058f29b 44dc816)
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)
commit7532413908b07d54d624215ae32982380afbdd77
tree40a88e6bae4e797cafce33f16a25e350c038f9bbtree | snapshot
parent058f29b20ab5806147f44043682aac44868e12efcommit | diff
parent44dc81691539bebc8ab022c94da1fef0351c71eacommit | diff
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 diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c diff1 | diff2 | blob | history
drivers/net/ethernet/freescale/fec.c diff1 | diff2 | blob | history
drivers/net/ethernet/micrel/ks8851.c diff1 | diff2 | blob | history
drivers/net/ethernet/micrel/ks8851_mll.c diff1 | diff2 | blob | history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c diff1 | diff2 | blob | history
drivers/net/ethernet/ti/cpmac.c diff1 | diff2 | blob | history
drivers/net/veth.c diff1 | diff2 | blob | history
drivers/net/wireless/rtlwifi/pci.c diff1 | diff2 | blob | history
net/core/netpoll.c diff1 | diff2 | blob | history
net/mac80211/main.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.