tree b5380500612993dc05c89d659fe91ec6d028269b
parent 9ad4107ba137f743fc531f9f4ceb81b122f9ff25
parent a13307cef8bf51990ef1d525b1cbdcc2cfe07e2a
author Linus Torvalds <torvalds@linux-foundation.org> 1215052156 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1215052156 -0700

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: acpiphp: cleanup notify handler on all root bridges
  PCI: Limit VPD read/write lengths for Broadcom 5706, 5708, 5709 rev.
  PCI: Restrict VPD read permission to root