6875564 assertion failed: un->un_pm_count == 0, file: ../../common/io/scsi/targets/sd.c, line: 9852 --HG-- rename : usr/src/uts/sparc/io/pciex/pcie_plat.c => usr/src/uts/sparc/io/pciex/pcie_sparc.c

6806540 SPARC and x86 bridge/switch nexus driver should be merged --HG-- rename : usr/src/uts/common/io/pcie.c => usr/src/uts/common/io/pciex/pcie.c rename : usr/src/uts/common/io/pcie_fault.c => usr/src/uts/common/io/pciex/pcie_fault.c rename : usr/src/uts/sun4/io/px/pcie_pwr.c => usr/src/uts/common/io/pciex/pcie_pwr.c rename : usr/src/uts/intel/io/pciex/pcie_pci.c => usr/src/uts/common/io/pciex/pcieb.c rename : usr/src/uts/intel/io/pciex/pcie_pci.conf => usr/src/uts/common/io/pciex/pcieb.conf rename : usr/src/uts/sun4/io/px/px_pci.h => usr/src/uts/common/io/pciex/pcieb.h rename : usr/src/uts/sun4/io/px/pcie_pwr.h => usr/src/uts/common/sys/pcie_pwr.h rename : usr/src/uts/intel/pcie_pci/Makefile => usr/src/uts/intel/pcieb/Makefile rename : usr/src/uts/sun4/io/px/pxb_plx.h => usr/src/uts/sparc/io/pciex/pcieb_plx.h rename : usr/src/uts/sparc/px_pci/Makefile => usr/src/uts/sparc/pcieb/Makefile rename : usr/src/uts/sparc/pxb_bcm/Makefile => usr/src/uts/sparc/pcieb_bcm/Makefile