]> git.karo-electronics.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 30129cf 3da889b)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Tue, 12 Mar 2013 09:52:22 +0000 (05:52 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 12 Mar 2013 09:52:22 +0000 (05:52 -0400)
commite5f2ef7ab4690d2e8faaf5fd203c5ecd70c3abaf
tree3558f68717c70a67e18c3274bb17709a353d036ftree | snapshot
parent30129cf28a5c99f9cb7c168f0d280f147fd6cc8bcommit | diff
parent3da889b616164bde76a37350cf28e0d17a94e979commit | diff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
drivers/net/ethernet/intel/e1000e/netdev.c

Minor conflict in e1000e, a line that got fixed in 'net'
has been removed in 'net-next'.

Signed-off-by: David S. Miller <davem@davemloft.net>
14 files changed:
drivers/net/ethernet/broadcom/tg3.c diff1 | diff2 | blob | history
drivers/net/ethernet/emulex/benet/be.h diff1 | diff2 | blob | history
drivers/net/ethernet/emulex/benet/be_cmds.c diff1 | diff2 | blob | history
drivers/net/ethernet/emulex/benet/be_hw.h diff1 | diff2 | blob | history
drivers/net/ethernet/emulex/benet/be_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/e1000e/ethtool.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/e1000e/ich8lan.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/e1000e/netdev.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx4/en_netdev.c diff1 | diff2 | blob | history
drivers/net/team/team.c diff1 | diff2 | blob | history
drivers/net/vxlan.c diff1 | diff2 | blob | history
net/bridge/br_multicast.c diff1 | diff2 | blob | history
net/core/dev.c diff1 | diff2 | blob | history
net/core/rtnetlink.c diff1 | diff2 | blob | history
Linux kernel for KaRo TX COM modules