From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 7 Nov 2008 17:18:14 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes... 
X-Git-Tag: v2.6.28-rc4~15
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8ec96e7bba2b8fa339b666354dffe3f47b9fa074;p=linux-2.6-omap-h63xx.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:
  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
---

8ec96e7bba2b8fa339b666354dffe3f47b9fa074