| commit | 11fe883936980fe242869d671092a466cf1db3e3 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Tue Jul 20 18:25:24 2010 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Tue Jul 20 18:25:24 2010 -0700 |
| tree | 14ff24e81eb4326e94eb5aa6432a1dd55cef5ece | |
| parent | 70d4bf6d467a330ccc947df9b2608e329d9e7708 [diff] | |
| parent | 573201f36fd9c7c6d5218cdcd9948cee700b277d [diff] |
Merge branch 'master' of master.kernel.org:/pub/scm/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>