]> rtime.felk.cvut.cz Git - lisovros/linux_canprio.git/commit
projects / lisovros / linux_canprio.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: da19431 b01543d)
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)
commit32efe08d77f5902ce7315fc9003c010ffffb8268
tree40a88e6bae4e797cafce33f16a25e350c038f9bbtree | snapshot
parentda1943164677ae2cdd630196b79089d476726348commit | diff
parentb01543dfe67bb1d191998e90d20534dc354de059commit | 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
CAN classifier for Linux Traffic Control