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

Commit b2c16e1e authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into x86/asm, to pick up fixes 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 81539169 d2ffb010

Documentation/devicetree/bindings/mmc/sdhci-st.txt

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ Required properties: 
			subsystem (mmcss) inside the FlashSS (available in STiH407 SoC

			family).



- clock-names:		Should be "mmc".

- clock-names:		Should be "mmc" and "icn".  (NB: The latter is not compulsory)

			See: Documentation/devicetree/bindings/resource-names.txt

- clocks:		Phandle to the clock.

			See: Documentation/devicetree/bindings/clock/clock-bindings.txt

MAINTAINERS

+3 −2
Original line number Diff line number Diff line
@@ -1625,6 +1625,7 @@ N: rockchip 
ARM/SAMSUNG EXYNOS ARM ARCHITECTURES

M:	Kukjin Kim <kgene@kernel.org>

M:	Krzysztof Kozlowski <krzk@kernel.org>

R:	Javier Martinez Canillas <javier@osg.samsung.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)

S:	Maintained
@@ -6102,7 +6103,7 @@ S: Supported 
F:	drivers/cpufreq/intel_pstate.c



INTEL FRAMEBUFFER DRIVER (excluding 810 and 815)

M:	Maik Broemme <mbroemme@plusserver.de>

M:	Maik Broemme <mbroemme@libmpq.org>

L:	linux-fbdev@vger.kernel.org

S:	Maintained

F:	Documentation/fb/intelfb.txt
@@ -12568,7 +12569,7 @@ F: include/linux/if_*vlan.h 
F:	net/8021q/



VLYNQ BUS

M:	Florian Fainelli <florian@openwrt.org>

M:	Florian Fainelli <f.fainelli@gmail.com>

L:	openwrt-devel@lists.openwrt.org (subscribers-only)

S:	Maintained

F:	drivers/vlynq/vlynq.c

Makefile

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

PATCHLEVEL = 8

SUBLEVEL = 0

EXTRAVERSION = -rc6

EXTRAVERSION = -rc7

NAME = Psychotic Stoned Sheep



# *DOCUMENTATION*

arch/arm/boot/dts/bcm2835-rpi.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 


/ {

	memory {

		device_type = "memory";

		reg = <0 0x10000000>;

	};

arch/arm/boot/dts/bcm283x.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
#include <dt-bindings/clock/bcm2835.h>

#include <dt-bindings/clock/bcm2835-aux.h>

#include <dt-bindings/gpio/gpio.h>

#include "skeleton.dtsi"



/* This include file covers the common peripherals and configuration between

 * bcm2835 and bcm2836 implementations, leaving the CPU configuration to
@@ -13,6 +12,8 @@ 
	compatible = "brcm,bcm2835";

	model = "BCM2835";

	interrupt-parent = <&intc>;

	#address-cells = <1>;

	#size-cells = <1>;



	chosen {

		bootargs = "earlyprintk console=ttyAMA0";