Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bda0c0af authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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: (42 commits)
  PCI: Change PCI subsystem MAINTAINER
  PCI: pci-iommu-iotlb-flushing-speedup
  PCI: pci_setup_bridge() mustn't be __devinit
  PCI: pci_bus_size_cardbus() mustn't be __devinit
  PCI: pci_scan_device() mustn't be __devinit
  PCI: pci_alloc_child_bus() mustn't be __devinit
  PCI: replace remaining __FUNCTION__ occurrences
  PCI: Hotplug: fakephp: Return success, not ENODEV, when bus rescan is triggered
  PCI: Hotplug: Fix leaks in IBM Hot Plug Controller Driver - ibmphp_init_devno()
  PCI: clean up resource alignment management
  PCI: aerdrv_acpi.c: remove unneeded NULL check
  PCI: Update VIA CX700 quirk
  PCI: Expose PCI VPD through sysfs
  PCI: iommu: iotlb flushing
  PCI: simplify quirk debug output
  PCI: iova RB tree setup tweak
  PCI: parisc: use generic pci_enable_resources()
  PCI: ppc: use generic pci_enable_resources()
  PCI: powerpc: use generic pci_enable_resources()
  PCI: ia64: use generic pci_enable_resources()
  ...
parents 904e0ab5 af40b485

Documentation/00-INDEX

+0 −10
Original line number Diff line number Diff line
@@ -25,8 +25,6 @@ DMA-API.txt 
	- DMA API, pci_ API & extensions for non-consistent memory machines.

DMA-ISA-LPC.txt

	- How to do DMA with ISA (and LPC) devices.

DMA-mapping.txt

	- info for PCI drivers using DMA portably across all platforms.

DocBook/

	- directory with DocBook templates etc. for kernel documentation.

HOWTO
@@ -43,8 +41,6 @@ ManagementStyle 
	- how to (attempt to) manage kernel hackers.

MSI-HOWTO.txt

	- the Message Signaled Interrupts (MSI) Driver Guide HOWTO and FAQ.

PCIEBUS-HOWTO.txt

	- a guide describing the PCI Express Port Bus driver.

RCU/

	- directory with info on RCU (read-copy update).

README.DAC960
@@ -285,12 +281,6 @@ parport.txt 
	- how to use the parallel-port driver.

parport-lowlevel.txt

	- description and usage of the low level parallel port functions.

pci-error-recovery.txt

	- info on PCI error recovery.

pci.txt

	- info on the PCI subsystem for device driver authors.

pcieaer-howto.txt

	- the PCI Express Advanced Error Reporting Driver Guide HOWTO.

pcmcia/

	- info on the Linux PCMCIA driver.

pi-futex.txt

Documentation/ABI/testing/sysfs-bus-pci

0 → 100644
+11 −0
Original line number Diff line number Diff line 
What:		/sys/bus/pci/devices/.../vpd

Date:		February 2008

Contact:	Ben Hutchings <bhutchings@solarflare.com>

Description:

		A file named vpd in a device directory will be a

		binary file containing the Vital Product Data for the

		device.  It should follow the VPD format defined in

		PCI Specification 2.1 or 2.2, but users should consider

		that some devices may have malformatted data.  If the

		underlying VPD has a writable section then the

		corresponding section of this file will be writable.

Documentation/PCI/00-INDEX

0 → 100644
+12 −0
Original line number Diff line number Diff line 
00-INDEX

	- this file

PCI-DMA-mapping.txt

	- info for PCI drivers using DMA portably across all platforms

PCIEBUS-HOWTO.txt

	- a guide describing the PCI Express Port Bus driver

pci-error-recovery.txt

	- info on PCI error recovery

pci.txt

	- info on the PCI subsystem for device driver authors

pcieaer-howto.txt

	- the PCI Express Advanced Error Reporting Driver Guide HOWTO

Documentation/PCIEBUS-HOWTO.txt→Documentation/PCI/PCIEBUS-HOWTO.txt

+6 −6

File changed and moved.

Contains only whitespace changes.