Merge tag 'zynq-soc-for-4.3' of https://github.com/Xilinx/linux-xlnx into next/soc
authorOlof Johansson <olof@lixom.net>
Wed, 5 Aug 2015 08:53:52 +0000 (10:53 +0200)
committerOlof Johansson <olof@lixom.net>
Wed, 5 Aug 2015 08:53:52 +0000 (10:53 +0200)
arm: Xilinx Zynq SoC patches for v4.2

- Fix earlyprintk, jump trampoline for SMP
- Update git tree location
- Setup PL310 aux (bit 22)

* tag 'zynq-soc-for-4.3' of https://github.com/Xilinx/linux-xlnx:
  ARM: zynq: reserve space for jump target in secondary trampoline
  clk: zynq: remove redundant $(CONFIG_ARCH_ZYNQ) in Makefile
  MAINTAINERS: Update Zynq git tree location
  ARM: zynq: Set bit 22 in PL310 AuxCtrl register (6395/1)
  ARM: zynq: Fix earlyprintk in big endian mode

Signed-off-by: Olof Johansson <olof@lixom.net>
1  2 
MAINTAINERS

diff --combined MAINTAINERS
index 07280fa654e6b2c1bc042c12b3dabe501a740324,9cde7e5265b6c5404e3ebcb4889a22b85b108bcb..1386a7dd8ba1164cca4959c968e58fe57e129cc1
@@@ -1578,10 -1578,7 +1578,10 @@@ ARM/UNIPHIER ARCHITECTUR
  M:    Masahiro Yamada <yamada.masahiro@socionext.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
 +F:    arch/arm/boot/dts/uniphier*
  F:    arch/arm/mach-uniphier/
 +F:    drivers/pinctrl/uniphier/
 +F:    drivers/tty/serial/8250/8250_uniphier.c
  N:    uniphier
  
  ARM/Ux500 ARM ARCHITECTURE
@@@ -1617,7 -1614,6 +1617,7 @@@ M:      Lorenzo Pieralisi <lorenzo.pieralisi
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/boot/dts/vexpress*
 +F:    arch/arm64/boot/dts/arm/vexpress*
  F:    arch/arm/mach-vexpress/
  F:    */*/vexpress*
  F:    */*/*/vexpress*
@@@ -1676,7 -1672,7 +1676,7 @@@ M:      Michal Simek <michal.simek@xilinx.co
  R:    Sören Brinkmann <soren.brinkmann@xilinx.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  W:    http://wiki.xilinx.com
- T:    git git://git.xilinx.com/linux-xlnx.git
+ T:    git https://github.com/Xilinx/linux-xlnx.git
  S:    Supported
  F:    arch/arm/mach-zynq/
  F:    drivers/cpuidle/cpuidle-zynq.c
@@@ -2566,31 -2562,19 +2566,31 @@@ F:   arch/powerpc/include/uapi/asm/spu*.
  F:    arch/powerpc/oprofile/*cell*
  F:    arch/powerpc/platforms/cell/
  
 -CEPH DISTRIBUTED FILE SYSTEM CLIENT
 +CEPH COMMON CODE (LIBCEPH)
 +M:    Ilya Dryomov <idryomov@gmail.com>
  M:    "Yan, Zheng" <zyan@redhat.com>
  M:    Sage Weil <sage@redhat.com>
  L:    ceph-devel@vger.kernel.org
  W:    http://ceph.com/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git
 +T:    git git://github.com/ceph/ceph-client.git
  S:    Supported
 -F:    Documentation/filesystems/ceph.txt
 -F:    fs/ceph/
  F:    net/ceph/
  F:    include/linux/ceph/
  F:    include/linux/crush/
  
 +CEPH DISTRIBUTED FILE SYSTEM CLIENT (CEPH)
 +M:    "Yan, Zheng" <zyan@redhat.com>
 +M:    Sage Weil <sage@redhat.com>
 +M:    Ilya Dryomov <idryomov@gmail.com>
 +L:    ceph-devel@vger.kernel.org
 +W:    http://ceph.com/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git
 +T:    git git://github.com/ceph/ceph-client.git
 +S:    Supported
 +F:    Documentation/filesystems/ceph.txt
 +F:    fs/ceph/
 +
  CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM:
  L:    linux-usb@vger.kernel.org
  S:    Orphan
@@@ -6163,7 -6147,6 +6163,7 @@@ L:      linux-nvdimm@lists.01.or
  Q:    https://patchwork.kernel.org/project/linux-nvdimm/list/
  S:    Supported
  F:    drivers/nvdimm/pmem.c
 +F:    include/linux/pmem.h
  
  LINUX FOR IBM pSERIES (RS/6000)
  M:    Paul Mackerras <paulus@au.ibm.com>
@@@ -6178,7 -6161,7 +6178,7 @@@ M:      Michael Ellerman <mpe@ellerman.id.au
  W:    http://www.penguinppc.org/
  L:    linuxppc-dev@lists.ozlabs.org
  Q:    http://patchwork.ozlabs.org/project/linuxppc-dev/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git
  S:    Supported
  F:    Documentation/powerpc/
  F:    arch/powerpc/
@@@ -8383,12 -8366,10 +8383,12 @@@ RADOS BLOCK DEVICE (RBD
  M:    Ilya Dryomov <idryomov@gmail.com>
  M:    Sage Weil <sage@redhat.com>
  M:    Alex Elder <elder@kernel.org>
 -M:    ceph-devel@vger.kernel.org
 +L:    ceph-devel@vger.kernel.org
  W:    http://ceph.com/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git
 +T:    git git://github.com/ceph/ceph-client.git
  S:    Supported
 +F:    Documentation/ABI/testing/sysfs-bus-rbd
  F:    drivers/block/rbd.c
  F:    drivers/block/rbd_types.h
  
This page took 0.032133 seconds and 5 git commands to generate.