tree 3f32d740cf6b02092ef8f00d37dbc4345ee4e0e8
parent 061afe9fe1a295ef950cf7e6c92fa7d4ae226f28
parent 2a42d9dba7842422ffb2c02e75288a8bc2fd5065
author Linus Torvalds <torvalds@linux-foundation.org> 1228932290 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1228932290 -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:
  PCIe: ASPM: Break out of endless loop waiting for PCI config bits to switch
  PCI: stop leaking 'slot_name' in pci_create_slot