Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 7 Nov 2008 17:18:14 +0000 (09:18 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 7 Nov 2008 17:18:14 +0000 (09:18 -0800)
commit8ec96e7bba2b8fa339b666354dffe3f47b9fa074
tree133e83776ab622259b5a8f852f75934822c09c93
parentcb110171a65c5a2d85ec814d498986db611040fd
parent88e7df0b7ee717f9db3333fb1248827bbdb2d4d3
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 range check on mmapped sysfs resource files
  PCI: remove excess kernel-doc notation
  PCI: annotate return value of pci_ioremap_bar with __iomem
  PCI: fix VPD limit quirk for Broadcom 5708S