Merge commit 'v2.6.39-rc6' into x86/cleanups (4cb1f43c) · Commits · e / devices / android_kernel_fairphone_FP3

.mailmap

+4 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ Andreas Herrmann <aherrman@de.ibm.com>
		Andrew Morton <akpm@osdl.org>
		Andrew Vasquez <andrew.vasquez@qlogic.com>
		Andy Adamson <andros@citi.umich.edu>
		Archit Taneja <archit@ti.com>
		Arnaud Patard <arnaud.patard@rtp-net.org>
		Arnd Bergmann <arnd@arndb.de>
		Axel Dyks <xl@xlsigned.net>
		@@ -70,6 +71,7 @@ Leonid I Ananiev <leonid.i.ananiev@intel.com>
		Linas Vepstas <linas@austin.ibm.com>
		Mark Brown <broonie@sirena.org.uk>
		Matthieu CASTET <castet.matthieu@free.fr>
		Mayuresh Janorkar <mayur@ti.com>
		Michael Buesch <mb@bu3sch.de>
		Michael Buesch <mbuesch@freenet.de>
		Michel Dänzer <michel@tungstengraphics.com>
		@@ -78,6 +80,7 @@ Morten Welinder <terra@gnome.org>
		Morten Welinder <welinder@anemone.rentec.com>
		Morten Welinder <welinder@darter.rentec.com>
		Morten Welinder <welinder@troll.com>
		Mythri P K <mythripk@ti.com>
		Nguyen Anh Quynh <aquynh@gmail.com>
		Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
		Patrick Mochel <mochel@digitalimplant.org>
		@@ -98,6 +101,7 @@ S.Çağlar Onur <caglar@pardus.org.tr>
		Simon Kelley <simon@thekelleys.org.uk>
		Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
		Stephen Hemminger <shemminger@osdl.org>
		Sumit Semwal <sumit.semwal@ti.com>
		Tejun Heo <htejun@gmail.com>
		Thomas Graf <tgraf@suug.ch>
		Tony Luck <tony.luck@intel.com>

+3 −3

Original line number	Diff line number	Diff line
		@@ -1677,7 +1677,7 @@ W: http://www.codemonkey.org.uk
		D: Assorted VIA x86 support.
		D: 2.5 AGPGART overhaul.
		D: CPUFREQ maintenance.
		D: Fedora kernel maintainence.
		D: Fedora kernel maintenance.
		D: Misc/Other.
		S: 314 Littleton Rd, Westford, MA 01886, USA

		@@ -3211,7 +3211,7 @@ N: James Simmons
		E: jsimmons@infradead.org
		E: jsimmons@users.sf.net
		D: Frame buffer device maintainer
		D: input layer developement
		D: input layer development
		D: tty/console layer
		D: various mipsel devices
		S: 115 Carmel Avenue
		@@ -3290,7 +3290,7 @@ S: USA
		N: Manfred Spraul
		E: manfred@colorfullife.com
		W: http://www.colorfullife.com/~manfred
		D: Lots of tiny hacks. Larger improvments to SysV IPC msg,
		D: Lots of tiny hacks. Larger improvements to SysV IPC msg,
		D: slab, pipe, select.
		S: 71701 Schwieberdingen
		S: Germany

+2 −2

Original line number	Diff line number	Diff line
		@@ -206,8 +206,8 @@ laptops/
		- directory with laptop related info and laptop driver documentation.
		ldm.txt
		- a brief description of LDM (Windows Dynamic Disks).
		leds-class.txt
		- documents LED handling under Linux.
		leds/
		- directory with info about LED handling under Linux.
		local_ops.txt
		- semantics and behavior of local atomic operations.
		lockdep-design.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -29,7 +29,7 @@ Contact: Cornelia Huck <cornelia.huck@de.ibm.com>
		linux-s390@vger.kernel.org
		Description: Contains the PIM/PAM/POM values, as reported by the
		channel subsystem when last queried by the common I/O
		layer (this implies that this attribute is not neccessarily
		layer (this implies that this attribute is not necessarily
		in sync with the values current in the channel subsystem).
		Note: This is an I/O-subchannel specific attribute.
		Users: s390-tools, HAL

0 → 100644

+6 −0

Original line number	Diff line number	Diff line
		What: /sys/bus/media/devices/.../model
		Date: January 2011
		Contact: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
		linux-media@vger.kernel.org
		Description: Contains the device model name in UTF-8. The device version is
		is not be appended to the model name.