---

yaml
---
r: 131807
b: refs/heads/master
c: e0ae4f5
h: refs/heads/master
i:
  131805: 912a9b9
  131803: ccc355e
  131799: cbbcdf7
  131791: 6cf492a
  131775: efc987e
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 64e71303e44f3697e4568147caa966de74bdb4fb
+refs/heads/master: e0ae4f5503235ba4449ffb5bcb4189edcef4d584

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

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,7 +6,7 @@
 # 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 \