Merge branch 'e1000-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 27 Apr 2007 17:14:53 +0000 (10:14 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 27 Apr 2007 17:14:53 +0000 (10:14 -0700)
commitc58b8e4a25a1ba347a0e5d21984c97bd296f1691
tree89f4727038fe7c108c3fa77494c9304f3d11d793
parentafc2e82c0851317931a9bfdb98271253371825c6
parentf50393fe869ba457cd75569c74c0f9bd2e7f7a0f
Merge branch 'e1000-fixes' of /linux/kernel/git/jgarzik/netdev-2.6

* 'e1000-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
  e1000: FIX: Stop raw interrupts disabled nag from RT
  e1000: FIX: firmware handover bits
  e1000: FIX: be ready for incoming irq at pci_request_irq
drivers/net/e1000/e1000_main.c