Merge branch 'topic/vmaster-update' into topic/docbook-fix (efdcd41b) · Commits · e / devices / android_kernel_samsung_universal8895

.mailmap

+3 −1

Original line number	Diff line number	Diff line
		@@ -92,6 +92,7 @@ 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>
		@@ -100,6 +101,7 @@ 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 <Uwe.Kleine-Koenig@digi.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>
		Valdis Kletnieks <Valdis.Kletnieks@vt.edu>

CREDITS

+4 −8

Original line number	Diff line number	Diff line
		@@ -2166,7 +2166,6 @@ 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
		@@ -3786,14 +3785,11 @@ S: The Netherlands

		N: David Woodhouse
		E: dwmw2@infradead.org
		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: JFFS2 file system, Memory Technology Device subsystem,
		D: various other stuff that annoyed me by not working.
		S: c/o Red Hat Engineering
		S: Rustat House
		S: 60 Clifton Road
		S: Cambridge. CB1 7EG
		S: c/o Intel Corporation
		S: Pipers Way
		S: Swindon. SN3 1RJ
		S: England

		N: Chris Wright

Documentation/ABI/testing/sysfs-bus-pci

+43 −0

Original line number	Diff line number	Diff line
		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>

Documentation/ABI/testing/sysfs-firmware-memmap

+1 −1

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

Documentation/Changes

+3 −1

Original line number	Diff line number	Diff line
		@@ -33,10 +33,12 @@ o Gnu make 3.79.1 # make --version
		o binutils 2.12 # ld -v
		o util-linux 2.10o # fdformat --version
		o module-init-tools 0.9.10 # depmod -V
		o e2fsprogs 1.29 # tune2fs
		o e2fsprogs 1.41.4 # e2fsck -V
		o jfsutils 1.1.3 # fsck.jfs -V
		o reiserfsprogs 3.6.3 # reiserfsck -V 2>&1\|grep reiserfsprogs
		o xfsprogs 2.6.0 # xfs_db -V
		o squashfs-tools 4.0 # mksquashfs -version
		o btrfs-progs 0.18 # btrfsck
		o pcmciautils 004 # pccardctl -V
		o quota-tools 3.09 # quota -V
		o PPP 2.4.0 # pppd --version