forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'fixes' into next/fixes-non-critical
Merge a set of fixes that we missed sending in before v4.0 release. These will also be sent to -stable. * fixes: (659 commits) ARM: at91/dt: sama5d3 xplained: add phy address for macb1 kbuild: Create directory for target DTB ARM: mvebu: Disable CPU Idle on Armada 38x arm64: juno: Fix misleading name of UART reference clock ARM: dts: sunxi: Remove overclocked/overvoltaged OPP ARM: dts: sun4i: a10-lime: Override and remove 1008MHz OPP setting ARM: socfpga: dts: fix spi1 interrupt ARM: dts: Fix gpio interrupts for dm816x ARM: dts: dra7: remove ti,hwmod property from pcie phy ARM: EXYNOS: Fix build breakage cpuidle on !SMP ARM: OMAP: dmtimer: disable pm runtime on remove ARM: OMAP: dmtimer: check for pm_runtime_get_sync() failure ARM: dts: fix lid and power pin-functions for exynos5250-spring ARM: dts: fix mmc node updates for exynos5250-spring ARM: OMAP2+: Fix socbus family info for AM33xx devices ARM: dts: omap3: Add missing dmas for crypto + Linux 4.0-rc4 Signed-off-by: Olof Johansson <[email protected]>
- Loading branch information
Showing
603 changed files
with
6,591 additions
and
3,557 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
Code of Conflict | ||
---------------- | ||
|
||
The Linux kernel development effort is a very personal process compared | ||
to "traditional" ways of developing software. Your code and ideas | ||
behind it will be carefully reviewed, often resulting in critique and | ||
criticism. The review will almost always require improvements to the | ||
code before it can be included in the kernel. Know that this happens | ||
because everyone involved wants to see the best possible solution for | ||
the overall success of Linux. This development process has been proven | ||
to create the most robust operating system kernel ever, and we do not | ||
want to do anything to cause the quality of submission and eventual | ||
result to ever decrease. | ||
|
||
If however, anyone feels personally abused, threatened, or otherwise | ||
uncomfortable due to this process, that is not acceptable. If so, | ||
please contact the Linux Foundation's Technical Advisory Board at | ||
<[email protected]>, or the individual members, and they | ||
will work to resolve the issue to the best of their ability. For more | ||
information on who is on the Technical Advisory Board and what their | ||
role is, please see: | ||
http://www.linuxfoundation.org/programs/advisory-councils/tab | ||
|
||
As a reviewer of code, please strive to keep things civil and focused on | ||
the technical issues involved. We are all humans, and frustrations can | ||
be high on both sides of the process. Try to keep in mind the immortal | ||
words of Bill and Ted, "Be excellent to each other." |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
19 changes: 19 additions & 0 deletions
19
Documentation/devicetree/bindings/serial/axis,etraxfs-uart.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
ETRAX FS UART | ||
|
||
Required properties: | ||
- compatible : "axis,etraxfs-uart" | ||
- reg: offset and length of the register set for the device. | ||
- interrupts: device interrupt | ||
|
||
Optional properties: | ||
- {dtr,dsr,ri,cd}-gpios: specify a GPIO for DTR/DSR/RI/CD | ||
line respectively. | ||
|
||
Example: | ||
|
||
serial@b00260000 { | ||
compatible = "axis,etraxfs-uart"; | ||
reg = <0xb0026000 0x1000>; | ||
interrupts = <68>; | ||
status = "disabled"; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,6 +12,9 @@ I. For patch submitters | |
|
||
[email protected] | ||
|
||
and Cc: the DT maintainers. Use scripts/get_maintainer.pl to identify | ||
all of the DT maintainers. | ||
|
||
3) The Documentation/ portion of the patch should come in the series before | ||
the code implementing the binding. | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1030,6 +1030,16 @@ F: arch/arm/mach-mxs/ | |
F: arch/arm/boot/dts/imx* | ||
F: arch/arm/configs/imx*_defconfig | ||
|
||
ARM/FREESCALE VYBRID ARM ARCHITECTURE | ||
M: Shawn Guo <[email protected]> | ||
M: Sascha Hauer <[email protected]> | ||
R: Stefan Agner <[email protected]> | ||
L: [email protected] (moderated for non-subscribers) | ||
S: Maintained | ||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git | ||
F: arch/arm/mach-imx/*vf610* | ||
F: arch/arm/boot/dts/vf* | ||
|
||
ARM/GLOMATION GESBC9312SX MACHINE SUPPORT | ||
M: Lennert Buytenhek <[email protected]> | ||
L: [email protected] (moderated for non-subscribers) | ||
|
@@ -1188,6 +1198,7 @@ ARM/Marvell Dove/MV78xx0/Orion SOC support | |
M: Jason Cooper <[email protected]> | ||
M: Andrew Lunn <[email protected]> | ||
M: Sebastian Hesselbarth <[email protected]> | ||
M: Gregory Clement <[email protected]> | ||
L: [email protected] (moderated for non-subscribers) | ||
S: Maintained | ||
F: arch/arm/mach-dove/ | ||
|
@@ -1351,6 +1362,7 @@ F: drivers/i2c/busses/i2c-rk3x.c | |
F: drivers/*/*rockchip* | ||
F: drivers/*/*/*rockchip* | ||
F: sound/soc/rockchip/ | ||
N: rockchip | ||
|
||
ARM/SAMSUNG EXYNOS ARM ARCHITECTURES | ||
M: Kukjin Kim <[email protected]> | ||
|
@@ -2065,7 +2077,7 @@ F: include/net/bluetooth/ | |
BONDING DRIVER | ||
M: Jay Vosburgh <[email protected]> | ||
M: Veaceslav Falico <[email protected]> | ||
M: Andy Gospodarek <[email protected]> | ||
M: Andy Gospodarek <[email protected]> | ||
L: [email protected] | ||
W: http://sourceforge.net/projects/bonding/ | ||
S: Supported | ||
|
@@ -2107,7 +2119,6 @@ F: drivers/net/ethernet/broadcom/bnx2x/ | |
|
||
BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITECTURE | ||
M: Christian Daudt <[email protected]> | ||
M: Matt Porter <[email protected]> | ||
M: Florian Fainelli <[email protected]> | ||
L: [email protected] | ||
T: git git://github.com/broadcom/mach-bcm | ||
|
@@ -2369,8 +2380,9 @@ F: arch/x86/include/asm/tce.h | |
|
||
CAN NETWORK LAYER | ||
M: Oliver Hartkopp <[email protected]> | ||
M: Marc Kleine-Budde <[email protected]> | ||
L: [email protected] | ||
W: http://gitorious.org/linux-can | ||
W: https://github.com/linux-can | ||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git | ||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git | ||
S: Maintained | ||
|
@@ -2386,7 +2398,7 @@ CAN NETWORK DRIVERS | |
M: Wolfgang Grandegger <[email protected]> | ||
M: Marc Kleine-Budde <[email protected]> | ||
L: [email protected] | ||
W: http://gitorious.org/linux-can | ||
W: https://github.com/linux-can | ||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git | ||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git | ||
S: Maintained | ||
|
@@ -8482,6 +8494,14 @@ S: Supported | |
L: [email protected] | ||
F: drivers/net/ethernet/samsung/sxgbe/ | ||
|
||
SAMSUNG THERMAL DRIVER | ||
M: Lukasz Majewski <[email protected]> | ||
L: [email protected] | ||
L: [email protected] | ||
S: Supported | ||
T: https://github.com/lmajewski/linux-samsung-thermal.git | ||
F: drivers/thermal/samsung/ | ||
|
||
SAMSUNG USB2 PHY DRIVER | ||
M: Kamil Debski <[email protected]> | ||
L: [email protected] | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.