git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
78d81d1
f42af6c
)
Merge branch 'master' of ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
author
David S. Miller
<davem@davemloft.net>
Mon, 24 Oct 2011 22:18:09 +0000
(18:18 -0400)
committer
David S. Miller
<davem@davemloft.net>
Mon, 24 Oct 2011 22:18:09 +0000
(18:18 -0400)
21 files changed:
1
2
MAINTAINERS
patch
|
diff1
|
diff2
|
blob
|
history
arch/mips/Kconfig
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/bonding/bond_main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/can/mscan/mscan.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/broadcom/tg3.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/jme.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/mellanox/mlx4/en_tx.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/realtek/r8169.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/smsc/smsc911x.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ppp/pptp.c
patch
|
diff1
|
diff2
|
blob
|
history
include/linux/skbuff.h
patch
|
diff1
|
diff2
|
blob
|
history
kernel/sys.c
patch
|
diff1
|
diff2
|
blob
|
history
net/batman-adv/translation-table.c
patch
|
diff1
|
diff2
|
blob
|
history
net/bridge/br_if.c
patch
|
diff1
|
diff2
|
blob
|
history
net/bridge/br_private.h
patch
|
diff1
|
diff2
|
blob
|
history
net/core/dev.c
patch
|
diff1
|
diff2
|
blob
|
history
net/core/fib_rules.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv4/route.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv4/tcp_minisocks.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
MAINTAINERS
index
5008b08
,
b3bc88d
..
bb4a83a
---
1
/
MAINTAINERS
---
2
/
MAINTAINERS
+++ b/
MAINTAINERS
@@@
-2468,10
-2460,10
+2468,10
@@@
S: Supporte
F: drivers/infiniband/hw/ehca/
EHEA (IBM pSeries eHEA 10Gb ethernet adapter) DRIVER
- M:
Breno Leitao <leita
o@linux.vnet.ibm.com>
+ M:
Thadeu Lima de Souza Cascardo <cascard
o@linux.vnet.ibm.com>
L: netdev@vger.kernel.org
S: Maintained
-F: drivers/net/ehea/
+F: drivers/net/e
thernet/ibm/e
hea/
EMBEDDED LINUX
M: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --cc
arch/mips/Kconfig
Simple merge
diff --cc
drivers/net/bonding/bond_main.c
Simple merge
diff --cc
drivers/net/can/mscan/mscan.c
Simple merge
diff --cc
drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
Simple merge
diff --cc
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
Simple merge
diff --cc
drivers/net/ethernet/broadcom/tg3.c
Simple merge
diff --cc
drivers/net/ethernet/jme.c
Simple merge
diff --cc
drivers/net/ethernet/mellanox/mlx4/en_tx.c
Simple merge
diff --cc
drivers/net/ethernet/realtek/r8169.c
Simple merge
diff --cc
drivers/net/ethernet/smsc/smsc911x.c
Simple merge
diff --cc
drivers/net/ppp/pptp.c
Simple merge
diff --cc
include/linux/skbuff.h
Simple merge
diff --cc
kernel/sys.c
Simple merge
diff --cc
net/batman-adv/translation-table.c
Simple merge
diff --cc
net/bridge/br_if.c
Simple merge
diff --cc
net/bridge/br_private.h
Simple merge
diff --cc
net/core/dev.c
Simple merge
diff --cc
net/core/fib_rules.c
Simple merge
diff --cc
net/ipv4/route.c
Simple merge
diff --cc
net/ipv4/tcp_minisocks.c
Simple merge