projects / platform / kernel / linux-amlogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 70d4bf6 573201f)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Wed, 21 Jul 2010 01:25:24 +0000 (18:25 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 21 Jul 2010 01:25:24 +0000 (18:25 -0700)
commit11fe883936980fe242869d671092a466cf1db3e3
tree14ff24e81eb4326e94eb5aa6432a1dd55cef5ecetree | snapshot
parent70d4bf6d467a330ccc947df9b2608e329d9e7708commit | diff
parent573201f36fd9c7c6d5218cdcd9948cee700b277dcommit | diff
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
drivers/vhost/net.c
net/bridge/br_device.c

Fix merge conflict in drivers/vhost/net.c with guidance from
Stephen Rothwell.

Revert the effects of net-2.6 commit 573201f36fd9c7c6d5218cdcd9948cee700b277d
since net-next-2.6 has fixes that make bridge netpoll work properly thus
we don't need it disabled.

Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/r8169.c diff1 | diff2 | blob | history
drivers/net/wireless/rt2x00/rt2x00dev.c diff1 | diff2 | blob | history
drivers/vhost/net.c diff1 | diff2 | blob | history
include/net/sock.h diff1 | diff2 | blob | history
net/core/dev.c diff1 | diff2 | blob | history
net/ipv4/ipmr.c diff1 | diff2 | blob | history
net/ipv4/tcp.c diff1 | diff2 | blob | history
net/ipv4/tcp_output.c diff1 | diff2 | blob | history
net/sched/act_nat.c diff1 | diff2 | blob | history
net/xfrm/xfrm_policy.c diff1 | diff2 | blob | history
Domain: System / Kernel;