Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 20 Nov 2008 02:57:16 +0000 (18:57 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 20 Nov 2008 02:57:16 +0000 (18:57 -0800)
commitee2f6cc7f9ea2542ad46070ed62ba7aa04d08871
tree93c9e6929891c9541060b5933a8f1f73bc8efe7b
parent3108864e2d70891d30d60af6af256a1b517d7078
parent1df8fb3d5f078f9cab901b6106ef2c9b74eef7df
Merge branch 'for-linus' of git://git./linux/kernel/git/jbarnes/pci-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  PCI: Fix disable IRQ 0 in pci_reset_function()