Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Jun 2011 15:36:16 +0000 (08:36 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Jun 2011 15:36:16 +0000 (08:36 -0700)
commit12f1ba5a7dac4caf8b4e6ccd6453f0a095e74c7c
tree8af7cdfba131994d24ecf0bc7bc701ce11835ba2
parent143e859d05d0abf4c3b67c64c93695d59fd41342
parent6e33a852a37dee02979ec9d82bea26c07cee5bce
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:
  x86/PCI/ACPI: fix type mismatch
  PCI: fix new kernel-doc warning
  PCI: Fix warning in drivers/pci/probe.c on sparc64
drivers/pci/pci.c