projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
05423b2
f568a92
)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
author
David S. Miller
<davem@davemloft.net>
Tue, 27 Oct 2009 08:03:26 +0000
(
01:03
-0700)
committer
David S. Miller
<davem@davemloft.net>
Tue, 27 Oct 2009 08:03:26 +0000
(
01:03
-0700)
Conflicts:
drivers/net/sh_eth.c
29 files changed:
1
2
drivers/net/Kconfig
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/benet/be_cmds.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/benet/be_cmds.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/benet/be_main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/bonding/bond_main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/e1000e/e1000.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethoc.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/gianfar.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ibm_newemac/core.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/igb/igb_ethtool.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/igbvf/ethtool.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ixgbe/ixgbe_ethtool.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/myri10ge/myri10ge.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/netxen/netxen_nic_hdr.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/netxen/netxen_nic_hw.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/netxen/netxen_nic_init.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/netxen/netxen_nic_main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/niu.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/r8169.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/sh_eth.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/virtio_net.c
patch
|
diff1
|
diff2
|
blob
|
history
include/net/inet_timewait_sock.h
patch
|
diff1
|
diff2
|
blob
|
history
net/bluetooth/l2cap.c
patch
|
diff1
|
diff2
|
blob
|
history
net/core/pktgen.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv4/inet_connection_sock.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv4/ip_sockglue.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv4/tcp.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv6/ipv6_sockglue.c
patch
|
diff1
|
diff2
|
blob
|
history
net/unix/af_unix.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/net/Kconfig
Simple merge
diff --cc
drivers/net/benet/be_cmds.c
Simple merge
diff --cc
drivers/net/benet/be_cmds.h
Simple merge
diff --cc
drivers/net/benet/be_main.c
Simple merge
diff --cc
drivers/net/bonding/bond_main.c
Simple merge
diff --cc
drivers/net/e1000e/e1000.h
Simple merge
diff --cc
drivers/net/ethoc.c
Simple merge
diff --cc
drivers/net/gianfar.c
Simple merge
diff --cc
drivers/net/ibm_newemac/core.c
Simple merge
diff --cc
drivers/net/igb/igb_ethtool.c
Simple merge
diff --cc
drivers/net/igbvf/ethtool.c
Simple merge
diff --cc
drivers/net/ixgbe/ixgbe_ethtool.c
Simple merge
diff --cc
drivers/net/myri10ge/myri10ge.c
Simple merge
diff --cc
drivers/net/netxen/netxen_nic_hdr.h
Simple merge
diff --cc
drivers/net/netxen/netxen_nic_hw.c
Simple merge
diff --cc
drivers/net/netxen/netxen_nic_init.c
Simple merge
diff --cc
drivers/net/netxen/netxen_nic_main.c
Simple merge
diff --cc
drivers/net/niu.c
Simple merge
diff --cc
drivers/net/r8169.c
Simple merge
diff --cc
drivers/net/sh_eth.c
index
161181a
,
528b912
..
5783f50
---
1
/
drivers/net/sh_eth.c
---
2
/
drivers/net/sh_eth.c
+++ b/
drivers/net/sh_eth.c
@@@
-30,7
-30,8
+30,9
@@@
#include <linux/phy.h>
#include <linux/cache.h>
#include <linux/io.h>
+#include <linux/pm_runtime.h>
+ #include <asm/cacheflush.h>
+
#include "sh_eth.h"
/* There is CPU dependent code */
diff --cc
drivers/net/virtio_net.c
Simple merge
diff --cc
include/net/inet_timewait_sock.h
Simple merge
diff --cc
net/bluetooth/l2cap.c
Simple merge
diff --cc
net/core/pktgen.c
Simple merge
diff --cc
net/ipv4/inet_connection_sock.c
Simple merge
diff --cc
net/ipv4/ip_sockglue.c
Simple merge
diff --cc
net/ipv4/tcp.c
Simple merge
diff --cc
net/ipv6/ipv6_sockglue.c
Simple merge
diff --cc
net/unix/af_unix.c
Simple merge