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

Commit 2d13ccaa authored by Russell King's avatar Russell King
Browse files

Merge branch 'irqchip-consolidation' of... 

Merge branch 'irqchip-consolidation' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into devel-stable

Conflicts:
	arch/arm/mach-omap2/board-4430sdp.c
	arch/arm/mach-omap2/board-omap4panda.c
	arch/arm/mach-omap2/include/mach/omap4-common.h
	arch/arm/plat-omap/include/plat/irqs.h

The changes to omap4-common.h were moved to arch/arm/mach-omap2/common.h
and the other trivial conflicts resolved.  The now empty ifdef in irqs.h
was also eliminated.
parents 59136ef3 11f1c5de

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ Juha Yrjola <juha.yrjola@solidboot.com> 
Kay Sievers <kay.sievers@vrfy.org>

Kenneth W Chen <kenneth.w.chen@intel.com>

Koushik <raghavendra.koushik@neterion.com>

Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Leonid I Ananiev <leonid.i.ananiev@intel.com>

Linas Vepstas <linas@austin.ibm.com>

Mark Brown <broonie@sirena.org.uk>
@@ -111,3 +112,4 @@ Uwe Kleine-König <ukl@pengutronix.de> 
Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>

Valdis Kletnieks <Valdis.Kletnieks@vt.edu>

Takashi YOSHII <takashi.yoshii.zj@renesas.com>

Yusuke Goda <goda.yusuke@renesas.com>

Documentation/DocBook/drm.tmpl

+168 −140

File changed.

Preview size limit exceeded, changes collapsed.

Documentation/cgroups/freezer-subsystem.txt

+2 −2
Original line number Diff line number Diff line
@@ -33,9 +33,9 @@ demonstrate this problem using nested bash shells: 


	From a second, unrelated bash shell:

	$ kill -SIGSTOP 16690

	$ kill -SIGCONT 16990

	$ kill -SIGCONT 16690



	<at this point 16990 exits and causes 16644 to exit too>

	<at this point 16690 exits and causes 16644 to exit too>



This happens because bash can observe both signals and choose how it

responds to them.

Documentation/devicetree/bindings/arm/gic.txt

+4 −0
Original line number Diff line number Diff line
@@ -42,6 +42,10 @@ Optional 
- interrupts	: Interrupt source of the parent interrupt controller. Only

  present on secondary GICs.



- cpu-offset	: per-cpu offset within the distributor and cpu interface

  regions, used when the GIC doesn't have banked registers. The offset is

  cpu-offset * cpu-nr.



Example:



	intc: interrupt-controller@fff11000 {

Documentation/devicetree/bindings/arm/vic.txt

0 → 100644
+29 −0
Original line number Diff line number Diff line 
* ARM Vectored Interrupt Controller



One or more Vectored Interrupt Controllers (VIC's) can be connected in an ARM

system for interrupt routing.  For multiple controllers they can either be

nested or have the outputs wire-OR'd together.



Required properties:



- compatible : should be one of

	"arm,pl190-vic"

	"arm,pl192-vic"

- interrupt-controller : Identifies the node as an interrupt controller

- #interrupt-cells : The number of cells to define the interrupts.  Must be 1 as

  the VIC has no configuration options for interrupt sources.  The cell is a u32

  and defines the interrupt number.

- reg : The register bank for the VIC.



Optional properties:



- interrupts : Interrupt source for parent controllers if the VIC is nested.



Example:



	vic0: interrupt-controller@60000 {

		compatible = "arm,pl192-vic";

		interrupt-controller;

		#interrupt-cells = <1>;

		reg = <0x60000 0x1000>;

	};