Merge commit 'v2.6.29-rc4' into tracing/core (4ad476e1) · Commits · e / devices / android_kernel_fairphone_FP3

.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>

Documentation/cpu-freq/user-guide.txt

+0 −16

Original line number	Diff line number	Diff line
		@@ -195,19 +195,3 @@ scaling_setspeed. By "echoing" a new frequency into this
		you can change the speed of the CPU,
		but only within the limits of
		scaling_min_freq and scaling_max_freq.


		3.2 Deprecated Interfaces
		-------------------------

		Depending on your kernel configuration, you might find the following
		cpufreq-related files:
		/proc/cpufreq
		/proc/sys/cpu/*/speed
		/proc/sys/cpu/*/speed-min
		/proc/sys/cpu/*/speed-max

		These are files for deprecated interfaces to cpufreq, which offer far
		less functionality. Because of this, these interfaces aren't described
		here.

Documentation/filesystems/sysfs-pci.txt

+12 −1

Original line number	Diff line number	Diff line
		@@ -9,6 +9,7 @@ that support it. For example, a given bus might look like this:
		\| \|-- class
		\| \|-- config
		\| \|-- device
		\| \|-- enable
		\| \|-- irq
		\| \|-- local_cpus
		\| \|-- resource
		@@ -32,6 +33,7 @@ files, each with their own function.
		class PCI class (ascii, ro)
		config PCI config space (binary, rw)
		device PCI device (ascii, ro)
		enable Whether the device is enabled (ascii, rw)
		irq IRQ number (ascii, ro)
		local_cpus nearby CPU mask (cpumask, ro)
		resource PCI resource host addresses (ascii, ro)
		@@ -57,10 +59,19 @@ used to do actual device programming from userspace. Note that some platforms
		don't support mmapping of certain resources, so be sure to check the return
		value from any attempted mmap.

		The 'enable' file provides a counter that indicates how many times the device
		has been enabled. If the 'enable' file currently returns '4', and a '1' is
		echoed into it, it will then return '5'. Echoing a '0' into it will decrease
		the count. Even when it returns to 0, though, some of the initialisation
		may not be reversed.

		The 'rom' file is special in that it provides read-only access to the device's
		ROM file, if available. It's disabled by default, however, so applications
		should write the string "1" to the file to enable it before attempting a read
		call, and disable it following the access by writing "0" to the file.
		call, and disable it following the access by writing "0" to the file. Note
		that the device must be enabled for a rom read to return data succesfully.
		In the event a driver is not bound to the device, it can be enabled using the
		'enable' file, documented above.

		Accessing legacy resources through sysfs
		----------------------------------------

MAINTAINERS

+10 −1

Original line number	Diff line number	Diff line
		@@ -1021,6 +1021,14 @@ M: mb@bu3sch.de
		W: http://bu3sch.de/btgpio.php
		S: Maintained

		BTRFS FILE SYSTEM
		P: Chris Mason
		M: chris.mason@oracle.com
		L: linux-btrfs@vger.kernel.org
		W: http://btrfs.wiki.kernel.org/
		T: git kernel.org:/pub/scm/linux/kernel/git/mason/btrfs-unstable.git
		S: Maintained

		BTTV VIDEO4LINUX DRIVER
		P: Mauro Carvalho Chehab
		M: mchehab@infradead.org
		@@ -2212,7 +2220,7 @@ P: Sean Hefty
		M: sean.hefty@intel.com
		P: Hal Rosenstock
		M: hal.rosenstock@gmail.com
		L: general@lists.openfabrics.org
		L: general@lists.openfabrics.org (moderated for non-subscribers)
		W: http://www.openib.org/
		T: git kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git
		S: Supported
		@@ -4847,6 +4855,7 @@ P: Ingo Molnar
		M: mingo@redhat.com
		P: H. Peter Anvin
		M: hpa@zytor.com
		M: x86@kernel.org
		L: linux-kernel@vger.kernel.org
		T: git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git
		S: Maintained

Makefile

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 2
		PATCHLEVEL = 6
		SUBLEVEL = 29
		EXTRAVERSION = -rc3
		EXTRAVERSION = -rc4
		NAME = Erotic Pickled Herring

		# DOCUMENTATION