---

yaml
---
r: 136336
b: refs/heads/master
c: 1c14fa4
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d735b4148d46446e64d72b22ef0344ee8dc02fa
+refs/heads/master: 1c14fa4937eb73509e07ac12bf8db1fdf4c42a59

trunk/CREDITS

@@ -2166,6 +2166,7 @@ D: Initial implementation of VC's, pty's and select()
 
 N: Pavel Machek
 E: pavel@ucw.cz
+E: pavel@suse.cz
 D: Softcursor for vga, hypertech cdrom support, vcsa bugfix, nbd
 D: sun4/330 port, capabilities for elf, speedup for rm on ext2, USB,
 D: work on suspend-to-ram/disk, killing duplicates from ioctl32
@@ -3738,7 +3739,7 @@ S: 93149 Nittenau
 S: Germany
 
 N: Gertjan van Wingerde
-E: gwingerde@gmail.com
+E: gwingerde@home.nl
 D: Ralink rt2x00 WLAN driver
 D: Minix V2 file-system
 D: Misc fixes

trunk/Documentation/ABI/testing/sysfs-bus-pci

@@ -1,46 +1,3 @@
-What:		/sys/bus/pci/drivers/.../bind
-Date:		December 2003
-Contact:	linux-pci@vger.kernel.org
-Description:
-		Writing a device location to this file will cause
-		the driver to attempt to bind to the device found at
-		this location.	This is useful for overriding default
-		bindings.  The format for the location is: DDDD:BB:DD.F.
-		That is Domain:Bus:Device.Function and is the same as
-		found in /sys/bus/pci/devices/.  For example:
-		# echo 0000:00:19.0 > /sys/bus/pci/drivers/foo/bind
-		(Note: kernels before 2.6.28 may require echo -n).
-
-What:		/sys/bus/pci/drivers/.../unbind
-Date:		December 2003
-Contact:	linux-pci@vger.kernel.org
-Description:
-		Writing a device location to this file will cause the
-		driver to attempt to unbind from the device found at
-		this location.	This may be useful when overriding default
-		bindings.  The format for the location is: DDDD:BB:DD.F.
-		That is Domain:Bus:Device.Function and is the same as
-		found in /sys/bus/pci/devices/. For example:
-		# echo 0000:00:19.0 > /sys/bus/pci/drivers/foo/unbind
-		(Note: kernels before 2.6.28 may require echo -n).
-
-What:		/sys/bus/pci/drivers/.../new_id
-Date:		December 2003
-Contact:	linux-pci@vger.kernel.org
-Description:
-		Writing a device ID to this file will attempt to
-		dynamically add a new device ID to a PCI device driver.
-		This may allow the driver to support more hardware than
-		was included in the driver's static device ID support
-		table at compile time.  The format for the device ID is:
-		VVVV DDDD SVVV SDDD CCCC MMMM PPPP.  That is Vendor ID,
-		Device ID, Subsystem Vendor ID, Subsystem Device ID,
-		Class, Class Mask, and Private Driver Data.  The Vendor ID
-		and Device ID fields are required, the rest are optional.
-		Upon successfully adding an ID, the driver will probe
-		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/devices/.../vpd
 Date:		February 2008
 Contact:	Ben Hutchings <bhutchings@solarflare.com>

trunk/Documentation/ABI/testing/sysfs-firmware-memmap

@@ -1,6 +1,6 @@
 What:		/sys/firmware/memmap/
 Date:		June 2008
-Contact:	Bernhard Walle <bernhard.walle@gmx.de>
+Contact:	Bernhard Walle <bwalle@suse.de>
 Description:
 		On all platforms, the firmware provides a memory map which the
 		kernel reads. The resources from that memory map are registered

trunk/Documentation/DocBook/Makefile

@@ -6,14 +6,13 @@
 # To add a new book the only step required is to add the book to the
 # list of DOCBOOKS.
 
-DOCBOOKS := z8530book.xml mcabook.xml device-drivers.xml \
+DOCBOOKS := z8530book.xml mcabook.xml \
 	    kernel-hacking.xml kernel-locking.xml deviceiobook.xml \
 	    procfs-guide.xml writing_usb_driver.xml networking.xml \
 	    kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml \
 	    gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \
 	    genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \
-	    mac80211.xml debugobjects.xml sh.xml regulator.xml \
-	    alsa-driver-api.xml writing-an-alsa-driver.xml
+	    mac80211.xml debugobjects.xml sh.xml regulator.xml
 
 ###
 # The build process is as follows (targets):