projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c44d799
4a9f65f
)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
author
David S. Miller
<davem@davemloft.net>
Mon, 11 Apr 2011 20:44:25 +0000
(13:44 -0700)
committer
David S. Miller
<davem@davemloft.net>
Mon, 11 Apr 2011 20:44:25 +0000
(13:44 -0700)
Conflicts:
drivers/net/smsc911x.c
40 files changed:
1
2
drivers/isdn/mISDN/layer2.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/atl1e/atl1e_main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/atlx/atl2.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/bcm63xx_enet.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/benet/be_cmds.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/benet/be_main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/bnx2x/bnx2x_hsi.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/bnx2x/bnx2x_main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/cris/eth_v10.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/cxgb4vf/cxgb4vf_main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/gianfar.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ibmlana.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/netxen/netxen_nic.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/netxen/netxen_nic_main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/pcnet32.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/s2io.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/s2io.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/sfc/net_driver.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/skge.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/sky2.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/smsc911x.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/stmmac/stmmac_main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/sungem.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/tg3.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/tg3.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/usb/smsc95xx.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/via-rhine.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/via-velocity.c
patch
|
diff1
|
diff2
|
blob
|
history
include/linux/ethtool.h
patch
|
diff1
|
diff2
|
blob
|
history
include/linux/pkt_sched.h
patch
|
diff1
|
diff2
|
blob
|
history
include/net/sock.h
patch
|
diff1
|
diff2
|
blob
|
history
net/bridge/br_fdb.c
patch
|
diff1
|
diff2
|
blob
|
history
net/bridge/br_ioctl.c
patch
|
diff1
|
diff2
|
blob
|
history
net/core/dev.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv4/fib_trie.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv4/ip_output.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv4/raw.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv4/route.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv4/udp.c
patch
|
diff1
|
diff2
|
blob
|
history
net/socket.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/isdn/mISDN/layer2.c
Simple merge
diff --cc
drivers/net/atl1e/atl1e_main.c
Simple merge
diff --cc
drivers/net/atlx/atl2.c
Simple merge
diff --cc
drivers/net/bcm63xx_enet.c
Simple merge
diff --cc
drivers/net/benet/be_cmds.c
Simple merge
diff --cc
drivers/net/benet/be_main.c
Simple merge
diff --cc
drivers/net/bnx2x/bnx2x_hsi.h
Simple merge
diff --cc
drivers/net/bnx2x/bnx2x_main.c
Simple merge
diff --cc
drivers/net/cris/eth_v10.c
Simple merge
diff --cc
drivers/net/cxgb4vf/cxgb4vf_main.c
Simple merge
diff --cc
drivers/net/gianfar.h
Simple merge
diff --cc
drivers/net/ibmlana.c
Simple merge
diff --cc
drivers/net/netxen/netxen_nic.h
Simple merge
diff --cc
drivers/net/netxen/netxen_nic_main.c
Simple merge
diff --cc
drivers/net/pcnet32.c
Simple merge
diff --cc
drivers/net/s2io.c
Simple merge
diff --cc
drivers/net/s2io.h
Simple merge
diff --cc
drivers/net/sfc/net_driver.h
Simple merge
diff --cc
drivers/net/skge.h
Simple merge
diff --cc
drivers/net/sky2.c
Simple merge
diff --cc
drivers/net/smsc911x.c
index 05a882e6e139f7c07fd399f6851f22050a4e7339,4b42ecc63dcfd582203141b5e8f92ddfb42a25ba..b8faab7780da4d9df6d92cf25c6535a128d04b28
---
1
/
drivers/net/smsc911x.c
---
2
/
drivers/net/smsc911x.c
+++ b/
drivers/net/smsc911x.c
@@@
-1669,7
-1669,7
+1669,7
@@@
static int smsc911x_eeprom_send_cmd(str
}
if (e2cmd & E2P_CMD_EPC_TIMEOUT_) {
- SMSC_TRACE(pdata, drv, "Error occured during eeprom operation");
- SMSC_TRACE(DRV, "Error occurred during eeprom operation");
++ SMSC_TRACE(pdata, drv, "Error occurred during eeprom operation");
return -EINVAL;
}
diff --cc
drivers/net/stmmac/stmmac_main.c
Simple merge
diff --cc
drivers/net/sungem.c
Simple merge
diff --cc
drivers/net/tg3.c
Simple merge
diff --cc
drivers/net/tg3.h
Simple merge
diff --cc
drivers/net/usb/smsc95xx.c
Simple merge
diff --cc
drivers/net/via-rhine.c
Simple merge
diff --cc
drivers/net/via-velocity.c
Simple merge
diff --cc
include/linux/ethtool.h
Simple merge
diff --cc
include/linux/pkt_sched.h
Simple merge
diff --cc
include/net/sock.h
Simple merge
diff --cc
net/bridge/br_fdb.c
Simple merge
diff --cc
net/bridge/br_ioctl.c
Simple merge
diff --cc
net/core/dev.c
Simple merge
diff --cc
net/ipv4/fib_trie.c
Simple merge
diff --cc
net/ipv4/ip_output.c
Simple merge
diff --cc
net/ipv4/raw.c
Simple merge
diff --cc
net/ipv4/route.c
Simple merge
diff --cc
net/ipv4/udp.c
Simple merge
diff --cc
net/socket.c
Simple merge