projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d9dd966
8df54d6
)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
author
David S. Miller
<davem@davemloft.net>
Sat, 11 Feb 2012 04:32:28 +0000
(23:32 -0500)
committer
David S. Miller
<davem@davemloft.net>
Sat, 11 Feb 2012 04:32:28 +0000
(23:32 -0500)
Conflicts:
drivers/infiniband/hw/nes/nes_cm.c
Simple whitespace conflict.
Signed-off-by: David S. Miller <davem@davemloft.net>
17 files changed:
1
2
MAINTAINERS
patch
|
diff1
|
diff2
|
blob
|
history
drivers/infiniband/hw/nes/nes_cm.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/brocade/bna/bnad_ethtool.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/intel/e1000/e1000_main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/intel/igb/igb_main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/marvell/skge.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/mellanox/mlx4/cmd.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/mellanox/mlx4/en_netdev.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/mellanox/mlx4/en_rx.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/renesas/sh_eth.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/renesas/sh_eth.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/via/via-velocity.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/mwifiex/init.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/mwifiex/main.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv4/tcp_ipv4.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
MAINTAINERS
Simple merge
diff --cc
drivers/infiniband/hw/nes/nes_cm.c
Simple merge
diff --cc
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
Simple merge
diff --cc
drivers/net/ethernet/brocade/bna/bnad_ethtool.c
Simple merge
diff --cc
drivers/net/ethernet/intel/e1000/e1000_main.c
Simple merge
diff --cc
drivers/net/ethernet/intel/igb/igb_main.c
Simple merge
diff --cc
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
Simple merge
diff --cc
drivers/net/ethernet/marvell/skge.c
Simple merge
diff --cc
drivers/net/ethernet/mellanox/mlx4/cmd.c
Simple merge
diff --cc
drivers/net/ethernet/mellanox/mlx4/en_netdev.c
Simple merge
diff --cc
drivers/net/ethernet/mellanox/mlx4/en_rx.c
Simple merge
diff --cc
drivers/net/ethernet/renesas/sh_eth.c
Simple merge
diff --cc
drivers/net/ethernet/renesas/sh_eth.h
Simple merge
diff --cc
drivers/net/ethernet/via/via-velocity.c
Simple merge
diff --cc
drivers/net/wireless/mwifiex/init.c
Simple merge
diff --cc
drivers/net/wireless/mwifiex/main.c
Simple merge
diff --cc
net/ipv4/tcp_ipv4.c
Simple merge