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

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



A set of overlapping changes in macvlan and the rocker
driver, nothing serious.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 52a623bd 4d8a991d

Documentation/devicetree/bindings/gpio/gpio-mvebu.txt

+3 −3
Original line number Diff line number Diff line
@@ -41,9 +41,9 @@ Required properties: 
Optional properties:



In order to use the GPIO lines in PWM mode, some additional optional

properties are required. Only Armada 370 and XP support these properties.

properties are required.



- compatible: Must contain "marvell,armada-370-xp-gpio"

- compatible: Must contain "marvell,armada-370-gpio"



- reg: an additional register set is needed, for the GPIO Blink

  Counter on/off registers.
@@ -71,7 +71,7 @@ Example: 
		};



		gpio1: gpio@18140 {

			compatible = "marvell,armada-370-xp-gpio";

			compatible = "marvell,armada-370-gpio";

			reg = <0x18140 0x40>, <0x181c8 0x08>;

			reg-names = "gpio", "pwm";

			ngpios = <17>;

Documentation/devicetree/bindings/mfd/stm32-timers.txt

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ Example: 
		compatible = "st,stm32-timers";

		reg = <0x40010000 0x400>;

		clocks = <&rcc 0 160>;

		clock-names = "clk_int";

		clock-names = "int";



		pwm {

			compatible = "st,stm32-pwm";

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -2964,7 +2964,7 @@ F: sound/pci/oxygen/ 


C6X ARCHITECTURE

M:	Mark Salter <msalter@redhat.com>

M:	Aurelien Jacquiot <a-jacquiot@ti.com>

M:	Aurelien Jacquiot <jacquiot.aurelien@gmail.com>

L:	linux-c6x-dev@linux-c6x.org

W:	http://www.linux-c6x.org/wiki/index.php/Main_Page

S:	Maintained

Makefile

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

PATCHLEVEL = 12

SUBLEVEL = 0

EXTRAVERSION = -rc6

EXTRAVERSION = -rc7

NAME = Fearless Coyote



# *DOCUMENTATION*
@@ -1437,7 +1437,7 @@ help: 
	@echo  '  make V=0|1 [targets] 0 => quiet build (default), 1 => verbose build'

	@echo  '  make V=2   [targets] 2 => give reason for rebuild of target'

	@echo  '  make O=dir [targets] Locate all output files in "dir", including .config'

	@echo  '  make C=1   [targets] Check all c source with $$CHECK (sparse by default)'

	@echo  '  make C=1   [targets] Check re-compiled c source with $$CHECK (sparse by default)'

	@echo  '  make C=2   [targets] Force check of all c source with $$CHECK'

	@echo  '  make RECORDMCOUNT_WARN=1 [targets] Warn about ignored mcount sections'

	@echo  '  make W=n   [targets] Enable extra gcc checks, n=1,2,3 where'

arch/arc/include/asm/processor.h

+0 −2
Original line number Diff line number Diff line
@@ -86,8 +86,6 @@ struct task_struct; 
#define TSK_K_BLINK(tsk)	TSK_K_REG(tsk, 4)

#define TSK_K_FP(tsk)		TSK_K_REG(tsk, 0)



#define thread_saved_pc(tsk)	TSK_K_BLINK(tsk)



extern void start_thread(struct pt_regs * regs, unsigned long pc,

			 unsigned long usp);