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

* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (30 commits)
  PCI: update for owner removal from struct device_attribute
  PCI: Fix warnings when CONFIG_DMI unset
  PCI: Do not run NVidia quirks related to MSI with MSI disabled
  x86/PCI: use for_each_pci_dev()
  PCI: use for_each_pci_dev()
  PCI: MSI: Restore read_msi_msg_desc(); add get_cached_msi_msg_desc()
  PCI: export SMBIOS provided firmware instance and label to sysfs
  PCI: Allow read/write access to sysfs I/O port resources
  x86/PCI: use host bridge _CRS info on ASRock ALiveSATA2-GLAN
  PCI: remove unused HAVE_ARCH_PCI_SET_DMA_MAX_SEGMENT_{SIZE|BOUNDARY}
  PCI: disable mmio during bar sizing
  PCI: MSI: Remove unsafe and unnecessary hardware access
  PCI: Default PCIe ASPM control to on and require !EMBEDDED to disable
  PCI: kernel oops on access to pci proc file while hot-removal
  PCI: pci-sysfs: remove casts from void*
  ACPI: Disable ASPM if the platform won't provide _OSC control for PCIe
  PCI hotplug: make sure child bridges are enabled at hotplug time
  PCI hotplug: shpchp: Removed check for hotplug of display devices
  PCI hotplug: pciehp: Fixed return value sign for pciehp_unconfigure_device
  PCI: Don't enable aspm before drivers have had a chance to veto it
  ...

1 files changed, 27 insertions, 0 deletions

diff --git a/Documentation/ABI/testing/sysfs-bus-pci b/Documentation/ABI/testing/sysfs-bus-pci
index 25be3250f7d6..f979d825d112 100644
--- a/Documentation/ABI/testing/sysfs-bus-pci
+++ b/Documentation/ABI/testing/sysfs-bus-pci
@@ -139,3 +139,30 @@ Contact:	linux-pci@vger.kernel.org
 Description:
                 This symbolic link points to the PCI hotplug controller driver
                 module that manages the hotplug slot.
+
+What:           /sys/bus/pci/devices/.../label
+Date:           July 2010
+Contact:        Narendra K <narendra_k@dell.com>, linux-bugs@dell.com
+Description:
+                Reading this attribute will provide the firmware
+                given name(SMBIOS type 41 string) of the PCI device.
+                The attribute will be created only if the firmware
+                has given a name to the PCI device.
+Users:
+                Userspace applications interested in knowing the
+                firmware assigned name of the PCI device.
+
+What:           /sys/bus/pci/devices/.../index
+Date:           July 2010
+Contact:        Narendra K <narendra_k@dell.com>, linux-bugs@dell.com
+Description:
+                Reading this attribute will provide the firmware
+                given instance(SMBIOS type 41 device type instance)
+                of the PCI device. The attribute will be created
+                only if the firmware has given a device type instance
+                to the PCI device.
+Users:
+                Userspace applications interested in knowing the
+                firmware assigned device type instance of the PCI
+                device that can help in understanding the firmware
+                intended order of the PCI device.