Google Git
Sign in
kunit / linux / 11fe883936980fe242869d671092a466cf1db3e3
commit11fe883936980fe242869d671092a466cf1db3e3[log] [tgz]
authorDavid S. Miller <davem@davemloft.net>Tue Jul 20 18:25:24 2010 -0700
committerDavid S. Miller <davem@davemloft.net>Tue Jul 20 18:25:24 2010 -0700
tree14ff24e81eb4326e94eb5aa6432a1dd55cef5ece
parent70d4bf6d467a330ccc947df9b2608e329d9e7708 [diff]
parent573201f36fd9c7c6d5218cdcd9948cee700b277d [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>
tree: 14ff24e81eb4326e94eb5aa6432a1dd55cef5ece
  1. arch/
  2. block/
  3. crypto/
  4. Documentation/
  5. drivers/
  6. firmware/
  7. fs/
  8. include/
  9. init/
  10. ipc/
  11. kernel/
  12. lib/
  13. mm/
  14. net/
  15. samples/
  16. scripts/
  17. security/
  18. sound/
  19. tools/
  20. usr/
  21. virt/
  22. .gitignore
  23. .mailmap
  24. COPYING
  25. CREDITS
  26. Kbuild
  27. MAINTAINERS
  28. Makefile
  29. README
  30. REPORTING-BUGS