aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2015-01-12 17:25:55 -0500
committerOlof Johansson <olof@lixom.net>2015-01-12 17:25:55 -0500
commit63bdaa9332dd8f582629b96bea44dd228231c64a (patch)
tree476f888d56db2e433496c548583fdd7005f9a082 /MAINTAINERS
parenteaa27f34e91a14cdceed26ed6c6793ec1d186115 (diff)
parent569dd56c9971c699472d3b270e988baf7f6de8c9 (diff)
Merge tag 'renesas-lager-board-removal-for-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup
Merge "Renesas ARM Based SoC Lager Board Removal for v3.20" from Simon Horman: "The serial port rename changes are not strictly related to lager board removal from a feature point of view. But the lager portion of this change depends on board removal to avoid a regression of booting using that code, And thus it seems to make sense to put here. And it seems best to put the koelsch and lager serial port rename changes in the same branch. Likewise the removal of bootargs from lager DT depends on removing lager board code to avoid a regression when using it and thus I have included it in the same branch." * Remove legacy r8a7790 SoC and its Lager board code * Update serial port names on koelsch and lager boards * Remove console bootargs parameter from lager DT * tag 'renesas-lager-board-removal-for-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: lager dts: Drop console= bootargs parameter ARM: shmobile: koelsch: Rename SCIF[01] serial ports to ttySC[01] ARM: shmobile: lager: Rename SCIFA[01] serial ports to ttySC[01] ARM: shmobile: r8a7790: Remove legacy code ARM: shmobile: lager: Remove legacy board support ARM: shmobile: lager-reference: DTS-only board support Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS1
1 files changed, 0 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 3589d67437f8..b65b22b0ea3e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1395,7 +1395,6 @@ F: arch/arm/configs/ape6evm_defconfig
1395F: arch/arm/configs/armadillo800eva_defconfig 1395F: arch/arm/configs/armadillo800eva_defconfig
1396F: arch/arm/configs/bockw_defconfig 1396F: arch/arm/configs/bockw_defconfig
1397F: arch/arm/configs/kzm9g_defconfig 1397F: arch/arm/configs/kzm9g_defconfig
1398F: arch/arm/configs/lager_defconfig
1399F: arch/arm/configs/mackerel_defconfig 1398F: arch/arm/configs/mackerel_defconfig
1400F: arch/arm/configs/marzen_defconfig 1399F: arch/arm/configs/marzen_defconfig
1401F: arch/arm/configs/shmobile_defconfig 1400F: arch/arm/configs/shmobile_defconfig