tree 151cde34d789db9fd8cf224603edff635997561a
parent 23beafbe3abd3f622931e83ef4e6b17642cf408e
parent a08f6e04d74478d91f34a0484e69e89870adb33d
author Linus Torvalds <torvalds@linux-foundation.org> 1234909415 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1234909415 -0800

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:
  PCI: Documentation: fix minor PCIe HOWTO thinko
  PCI: fix missing kernel-doc and typos
  PCI: fix struct pci_platform_pm_ops kernel-doc
  PCI: fix rom.c kernel-doc warning
  PCI/MSI: fix msi_mask() shift fix