---

yaml
---
r: 137039
b: refs/heads/master
c: bc22c17
h: refs/heads/master
i:
  137037: 4d69b84
  137035: a915e4a
  137031: abb9a9a
  137023: 83e284b
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2fb6b2a048ed8fa3f049c7d42f7a2dd3f0c8d7a6
+refs/heads/master: bc22c17e12c130dc929218a95aa347e0f3fd05dc

trunk/.mailmap

@@ -32,7 +32,6 @@ Christoph Hellwig <hch@lst.de>
 Corey Minyard <minyard@acm.org>
 David Brownell <david-b@pacbell.net>
 David Woodhouse <dwmw2@shinybook.infradead.org>
-Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
 Domen Puncer <domen@coderock.org>
 Douglas Gilbert <dougg@torque.net>
 Ed L. Cashin <ecashin@coraid.com>
@@ -92,7 +91,6 @@ Rudolf Marek <R.Marek@sh.cvut.cz>
 Rui Saraiva <rmps@joel.ist.utl.pt>
 Sachin P Sant <ssant@in.ibm.com>
 Sam Ravnborg <sam@mars.ravnborg.org>
-Sascha Hauer <s.hauer@pengutronix.de>
 S.Çağlar Onur <caglar@pardus.org.tr>
 Simon Kelley <simon@thekelleys.org.uk>
 Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
@@ -101,7 +99,6 @@ Tejun Heo <htejun@gmail.com>
 Thomas Graf <tgraf@suug.ch>
 Tony Luck <tony.luck@intel.com>
 Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>
-Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
-Uwe Kleine-König <ukl@pengutronix.de>
 Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
+Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
 Valdis Kletnieks <Valdis.Kletnieks@vt.edu>

trunk/CREDITS

@@ -464,11 +464,6 @@ S: 1200 Goldenrod Dr.
 S: Nampa, Idaho 83686
 S: USA
 
-N: Dirk J. Brandewie
-E: dirk.j.brandewie@intel.com
-E: linux-wimax@intel.com
-D: Intel Wireless WiMAX Connection 2400 SDIO driver
-
 N: Derrick J. Brashear
 E: shadow@dementia.org
 W: http://www.dementia.org/~shadow
@@ -1686,7 +1681,7 @@ E: ajoshi@shell.unixbox.com
 D: fbdev hacking
 
 N: Jesper Juhl
-E: jj@chaosbits.net
+E: jesper.juhl@gmail.com
 D: Various fixes, cleanups and minor features all over the tree.
 D: Wrote initial version of the hdaps driver (since passed on to others).
 S: Lemnosvej 1, 3.tv
@@ -2124,11 +2119,6 @@ N: H.J. Lu
 E: hjl@gnu.ai.mit.edu
 D: GCC + libraries hacker
 
-N: Yanir Lubetkin
-E: yanirx.lubatkin@intel.com
-E: linux-wimax@intel.com
-D: Intel Wireless WiMAX Connection 2400 driver
-
 N: Michal Ludvig
 E: michal@logix.cz
 E: michal.ludvig@asterisk.co.nz
@@ -2166,6 +2156,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
@@ -2702,13 +2693,6 @@ S: RR #5, 497 Pole Line Road
 S: Thunder Bay, Ontario
 S: CANADA P7C 5M9
 
-N: Inaky Perez-Gonzalez
-E: inaky.perez-gonzalez@intel.com
-E: linux-wimax@intel.com
-E: inakypg@yahoo.com
-D: WiMAX stack
-D: Intel Wireless WiMAX Connection 2400 driver
-
 N: Yuri Per
 E: yuri@pts.mipt.ru
 D: Some smbfs fixes
@@ -3785,11 +3769,14 @@ S: The Netherlands
 
 N: David Woodhouse
 E: dwmw2@infradead.org
-D: JFFS2 file system, Memory Technology Device subsystem,
+D: ARCnet stuff, Applicom board driver, SO_BINDTODEVICE,
+D: some Alpha platform porting from 2.0, Memory Technology Devices,
+D: Acquire watchdog timer, PC speaker driver maintenance,
 D: various other stuff that annoyed me by not working.
-S: c/o Intel Corporation
-S: Pipers Way
-S: Swindon. SN3 1RJ
+S: c/o Red Hat Engineering
+S: Rustat House
+S: 60 Clifton Road
+S: Cambridge. CB1 7EG
 S: England
 
 N: Chris Wright

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>