Merge branch master from git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git (7a30bdd9) · Commits · e / devices / android_kernel_fairphone_FP5

.gitignore

+4 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@
		*.lz4
		*.lzma
		*.lzo
		*.mod
		*.mod.c
		*.o
		.o.
		@@ -141,3 +142,6 @@ x509.genkey

		# Kdevelop4
		*.kdev4

		# Clang's compilation database file
		/compile_commands.json

+3 −0

Original line number	Diff line number	Diff line
		@@ -98,6 +98,7 @@ Jason Gunthorpe <jgg@ziepe.ca> <jgunthorpe@obsidianresearch.com>
		Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com>
		<javier@osg.samsung.com> <javier.martinez@collabora.co.uk>
		Jean Tourrilhes <jt@hpl.hp.com>
		<jean-philippe@linaro.org> <jean-philippe.brucker@arm.com>
		Jeff Garzik <jgarzik@pretzel.yyz.us>
		Jeff Layton <jlayton@kernel.org> <jlayton@redhat.com>
		Jeff Layton <jlayton@kernel.org> <jlayton@poochiereds.net>
		@@ -116,6 +117,7 @@ John Stultz <johnstul@us.ibm.com>
		Juha Yrjola <at solidboot.com>
		Juha Yrjola <juha.yrjola@nokia.com>
		Juha Yrjola <juha.yrjola@solidboot.com>
		Julien Thierry <julien.thierry.kdev@gmail.com> <julien.thierry@arm.com>
		Kay Sievers <kay.sievers@vrfy.org>
		Kenneth W Chen <kenneth.w.chen@intel.com>
		Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>
		@@ -132,6 +134,7 @@ Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>
		Li Yang <leoyang.li@nxp.com> <leo@zh-kernel.org>
		Li Yang <leoyang.li@nxp.com> <leoli@freescale.com>
		Maciej W. Rozycki <macro@mips.com> <macro@imgtec.com>
		Marc Zyngier <maz@kernel.org> <marc.zyngier@arm.com>
		Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>
		Mark Brown <broonie@sirena.org.uk>
		Mark Yao <markyao0591@gmail.com> <mark.yao@rock-chips.com>

+2 −3

Original line number	Diff line number	Diff line
		@@ -1770,7 +1770,6 @@ S: USA

		N: Dave Jones
		E: davej@codemonkey.org.uk
		W: http://www.codemonkey.org.uk
		D: Assorted VIA x86 support.
		D: 2.5 AGPGART overhaul.
		D: CPUFREQ maintenance.
		@@ -1800,7 +1799,7 @@ S: 2300 Copenhagen S.
		S: Denmark

		N: Jozsef Kadlecsik
		E: kadlec@blackhole.kfki.hu
		E: kadlec@netfilter.org
		P: 1024D/470DB964 4CB3 1A05 713E 9BF7 FAC5 5809 DD8C B7B1 470D B964
		D: netfilter: TCP window tracking code
		D: netfilter: raw table
		@@ -3120,7 +3119,7 @@ S: France
		N: Rik van Riel
		E: riel@redhat.com
		W: http://www.surriel.com/
		D: Linux-MM site, Documentation/sysctl/*, swap/mm readaround
		D: Linux-MM site, Documentation/admin-guide/sysctl/*, swap/mm readaround
		D: kswapd fixes, random kernel hacker, rmap VM,
		D: nl.linux.org administrator, minor scheduler additions
		S: Red Hat Boston

+1 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@ Description: It is possible to switch the cpi setting of the mouse with the
		press of a button.
		When read, this file returns the raw number of the actual cpi
		setting reported by the mouse. This number has to be further
		processed to receive the real dpi value.
		processed to receive the real dpi value:

		VALUE DPI
		1 400

+1 −1

Original line number	Diff line number	Diff line
		@@ -11,7 +11,7 @@ Description:
		Kernel code may export it for complete or partial access.

		GPIOs are identified as they are inside the kernel, using integers in
		the range 0..INT_MAX. See Documentation/gpio for more information.
		the range 0..INT_MAX. See Documentation/admin-guide/gpio for more information.

		/sys/class/gpio
		/export ... asks the kernel to export a GPIO to userspace