From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 24 Jun 2011 15:36:16 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
X-Git-Tag: v3.0-rc5~39
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=12f1ba5a7dac4caf8b4e6ccd6453f0a095e74c7c;p=linux.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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
---

12f1ba5a7dac4caf8b4e6ccd6453f0a095e74c7c