Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6

Browse source

* '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...

...

This commit is contained in:

Linus Torvalds 2008-08-25 11:25:10 -07:00

parent b9b50363e6 ebca4f1bce

commit a56cb4ecbd

5 changed files with 32 additions and 37 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

drivers/pci/hotplug/pciehp.h

View file

21

drivers/pci/hotplug/pciehp_core.c

View file

11

drivers/pci/hotplug/pciehp_hpc.c

View file

34

drivers/pci/hotplug/shpchp_core.c

View file

2

drivers/pci/search.c

View file