---

yaml --- r: 140237 b: refs/heads/master c: 93e14ba h: refs/heads/master i: 140235: bf1f66a v: v3
git-mirror · Mar 31, 2009 · 3f28fc1 · 3f28fc1
1 parent d28d103
commit 3f28fc1
Show file tree

Hide file tree

Showing 1,268 changed files with 27,261 additions and 82,164 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca1ee219c070eab755712d50638bbcd1f8630fc1
+refs/heads/master: 93e14baa4494607efe81608725f591e3ba31e3c1
diff --git a/trunk/CREDITS b/trunk/CREDITS
@@ -495,11 +495,6 @@ S: Kopmansg 2
 S: 411 13  Goteborg
 S: Sweden
 
-N: Paul Bristow
-E: paul@paulbristow.net
-W: http://paulbristow.net/linux/idefloppy.html
-D: Maintainer of IDE/ATAPI floppy driver
-
 N: Dominik Brodowski
 E: linux@brodo.de
 W: http://www.brodo.de/
@@ -2647,10 +2642,6 @@ S: C/ Mieses 20, 9-B
 S: Valladolid 47009
 S: Spain
 
-N: Gadi Oxman
-E: gadio@netvision.net.il
-D: Original author and maintainer of IDE/ATAPI floppy/tape drivers
-
 N: Greg Page
 E: gpage@sovereign.org
 D: IPX development and support

diff --git a/trunk/Documentation/ABI/testing/sysfs-bus-pci b/trunk/Documentation/ABI/testing/sysfs-bus-pci
@@ -41,49 +41,6 @@ Description:
 		for the device and attempt to bind to it.  For example:
 		# echo "8086 10f5" > /sys/bus/pci/drivers/foo/new_id
 
-What:		/sys/bus/pci/drivers/.../remove_id
-Date:		February 2009
-Contact:	Chris Wright <chrisw@sous-sol.org>
-Description:
-		Writing a device ID to this file will remove an ID
-		that was dynamically added via the new_id sysfs entry.
-		The format for the device ID is:
-		VVVV DDDD SVVV SDDD CCCC MMMM.	That is Vendor ID, Device
-		ID, Subsystem Vendor ID, Subsystem Device ID, Class,
-		and Class Mask.  The Vendor ID and Device ID fields are
-		required, the rest are optional.  After successfully
-		removing an ID, the driver will no longer support the
-		device.  This is useful to ensure auto probing won't
-		match the driver to the device.  For example:
-		# echo "8086 10f5" > /sys/bus/pci/drivers/foo/remove_id
-
-What:		/sys/bus/pci/rescan
-Date:		January 2009
-Contact:	Linux PCI developers <linux-pci@vger.kernel.org>
-Description:
-		Writing a non-zero value to this attribute will
-		force a rescan of all PCI buses in the system, and
-		re-discover previously removed devices.
-		Depends on CONFIG_HOTPLUG.
-
-What:		/sys/bus/pci/devices/.../remove
-Date:		January 2009
-Contact:	Linux PCI developers <linux-pci@vger.kernel.org>
-Description:
-		Writing a non-zero value to this attribute will
-		hot-remove the PCI device and any of its children.
-		Depends on CONFIG_HOTPLUG.
-
-What:		/sys/bus/pci/devices/.../rescan
-Date:		January 2009
-Contact:	Linux PCI developers <linux-pci@vger.kernel.org>
-Description:
-		Writing a non-zero value to this attribute will
-		force a rescan of the device's parent bus and all
-		child buses, and re-discover devices removed earlier
-		from this part of the device tree.
-		Depends on CONFIG_HOTPLUG.
-
 What:		/sys/bus/pci/devices/.../vpd
 Date:		February 2008
 Contact:	Ben Hutchings <bhutchings@solarflare.com>
@@ -95,30 +52,3 @@ Description:
 		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.
-
-What:		/sys/bus/pci/devices/.../virtfnN
-Date:		March 2009
-Contact:	Yu Zhao <yu.zhao@intel.com>
-Description:
-		This symbolic link appears when hardware supports the SR-IOV
-		capability and the Physical Function driver has enabled it.
-		The symbolic link points to the PCI device sysfs entry of the
-		Virtual Function whose index is N (0...MaxVFs-1).
-
-What:		/sys/bus/pci/devices/.../dep_link
-Date:		March 2009
-Contact:	Yu Zhao <yu.zhao@intel.com>
-Description:
-		This symbolic link appears when hardware supports the SR-IOV
-		capability and the Physical Function driver has enabled it,
-		and this device has vendor specific dependencies with others.
-		The symbolic link points to the PCI device sysfs entry of
-		Physical Function this device depends on.
-
-What:		/sys/bus/pci/devices/.../physfn
-Date:		March 2009
-Contact:	Yu Zhao <yu.zhao@intel.com>
-Description:
-		This symbolic link appears when a device is a Virtual Function.
-		The symbolic link points to the PCI device sysfs entry of the
-		Physical Function this device associates with.
diff --git a/trunk/Documentation/ABI/testing/sysfs-fs-ext4 b/trunk/Documentation/ABI/testing/sysfs-fs-ext4
diff --git a/trunk/Documentation/DocBook/.gitignore b/trunk/Documentation/DocBook/.gitignore
@@ -4,7 +4,3 @@
 *.html
 *.9.gz
 *.9
-*.aux
-*.dvi
-*.log
-*.out
diff --git a/trunk/Documentation/DocBook/kernel-api.tmpl b/trunk/Documentation/DocBook/kernel-api.tmpl
@@ -199,7 +199,6 @@ X!Edrivers/pci/hotplug.c
 -->
 !Edrivers/pci/probe.c
 !Edrivers/pci/rom.c
-!Edrivers/pci/iov.c
      </sect1>
      <sect1><title>PCI Hotplug Support Library</title>
 !Edrivers/pci/hotplug/pci_hotplug_core.c
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,3 @@ @@
     *.html
     *.9.gz
     *.9
-    *.aux
-    *.dvi
-    *.log
-    *.out