Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b50afd20 authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 



Three sets of overlapping changes.  Nothing serious.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d6169b02 c8d2bc9b

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ James Bottomley <jejb@mulgrave.(none)> 
James Bottomley <jejb@titanic.il.steeleye.com>

James E Wilson <wilson@specifix.com>

James Ketrenos <jketreno@io.(none)>

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>

Jeff Garzik <jgarzik@pretzel.yyz.us>

Documentation/devicetree/bindings/input/touchscreen/silead_gsl1680.txt

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ Required properties: 
- touchscreen-size-y	  : See touchscreen.txt



Optional properties:

- firmware-name		  : File basename (string) for board specific firmware

- touchscreen-inverted-x  : See touchscreen.txt

- touchscreen-inverted-y  : See touchscreen.txt

- touchscreen-swapped-x-y : See touchscreen.txt

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -8753,7 +8753,7 @@ F: drivers/oprofile/ 
F:	include/linux/oprofile.h



ORACLE CLUSTER FILESYSTEM 2 (OCFS2)

M:	Mark Fasheh <mfasheh@suse.com>

M:	Mark Fasheh <mfasheh@versity.com>

M:	Joel Becker <jlbec@evilplan.org>

L:	ocfs2-devel@oss.oracle.com (moderated for non-subscribers)

W:	http://ocfs2.wiki.kernel.org
@@ -11641,7 +11641,7 @@ F: Documentation/devicetree/bindings/thermal/ 
THERMAL/CPU_COOLING

M:	Amit Daniel Kachhap <amit.kachhap@gmail.com>

M:	Viresh Kumar <viresh.kumar@linaro.org>

M:	Javi Merino <javi.merino@arm.com>

M:	Javi Merino <javi.merino@kernel.org>

L:	linux-pm@vger.kernel.org

S:	Supported

F:	Documentation/thermal/cpu-cooling-api.txt

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 8

SUBLEVEL = 0

EXTRAVERSION = -rc7

EXTRAVERSION =

NAME = Psychotic Stoned Sheep



# *DOCUMENTATION*

arch/arm/boot/compressed/head.S

+1 −1
Original line number Diff line number Diff line
@@ -779,7 +779,7 @@ __armv7_mmu_cache_on: 
		orrne	r0, r0, #1		@ MMU enabled

		movne	r1, #0xfffffffd		@ domain 0 = client

		bic     r6, r6, #1 << 31        @ 32-bit translation system

		bic     r6, r6, #3 << 0         @ use only ttbr0

		bic     r6, r6, #(7 << 0) | (1 << 4)	@ use only ttbr0

		mcrne	p15, 0, r3, c2, c0, 0	@ load page table pointer

		mcrne	p15, 0, r1, c3, c0, 0	@ load domain access control

		mcrne   p15, 0, r6, c2, c0, 2   @ load ttb control