[git pull] PCI fixes

[Jesse Barnes <jbarnes@virtuousgeek.org>]

The following changes since commit
af0d6a0a3a30946f7df69c764791f1b0643f7cd6:

  Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (2011-06-01 02:07:22 +0900)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 for-linus

Just a few minor fixes.  We have one open issue with the resource
re-allocation code that was re-added.  Ram has a fix but I'm concerned
it will introduce other regressions.  So at this point we have a few
options:
  - revert the bridge resource re-allocation code (again)
  - hide the re-allocation code behind a new kernel option (and not
    try=!), this would at least let us experiment with new strategies
    and PNP resource tracking etc
  - apply Ram's patch and revert it all later if things are still broken

The last option gets us the most coverage, but it's a bit late in the
cycle to be experimenting like this...

David S. Miller (1):
      PCI: Fix warning in drivers/pci/probe.c on sparc64

Márton Németh (1):
      x86/PCI/ACPI: fix type mismatch

Randy Dunlap (1):
      PCI: fix new kernel-doc warning

 arch/x86/pci/acpi.c |    2 +-
 drivers/pci/pci.c   |    2 +-
 drivers/pci/probe.c |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Thanks,
-- 
Jesse Barnes, Intel Open Source Technology Center