tree 7f81320e09983d749bc38047857563f7fd269480
parent b15a3891c916f32a29832886a053a48be2741d4d
parent cc74d96f47b0d916840f92092595e3be9731e047
author Linus Torvalds <torvalds@linux-foundation.org> 1205439382 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1205439382 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6:
  PCI: fix issue with busses registering multiple times in sysfs