]> err.no Git - linux-2.6/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 25 Aug 2008 18:25:10 +0000 (11:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 25 Aug 2008 18:25:10 +0000 (11:25 -0700)
commita56cb4ecbdb66a504601dfacc31cd0cf91c97e7f
tree748f6fcef042122249d6df8816b4463bb532972a
parentb9b50363e6c60d471fe2e71e48d434aad58b3749
parentebca4f1bce1eb7b91a63c515db66316db9391221
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 reference leak in pci_get_dev_by_id()
  PCI: shpchp: Rename duplicate slot name N as N-1, N-2, N-M...
  PCI: pciehp: Rename duplicate slot name N as N-1, N-2, N-M...