Merge branch 'intx' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6
authorLinus Torvalds <torvalds@woody.osdl.org>
Thu, 7 Dec 2006 23:04:20 +0000 (15:04 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Thu, 7 Dec 2006 23:04:20 +0000 (15:04 -0800)
commit7f3af60e5a444b287d740a84998a8f480645dadf
tree1ab3e5aff5139233d743dcf5e369b75544aa5dd2
parent21b4e736922f546e0f1aa7b9d6c442f309a2444a
parent1769b46a3ed9ce68c835f84493be46e606e58ef1
Merge branch 'intx' of /linux/kernel/git/jgarzik/misc-2.6

* 'intx' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
  PCI MSI: always toggle legacy-INTx-enable bit upon MSI entry/exit
drivers/pci/msi.c