Merge tag 'zynq-defconfig-for-3.11' of git://git.xilinx.com/linux-xlnx into next...
authorArnd Bergmann <arnd@arndb.de>
Fri, 21 Jun 2013 13:48:32 +0000 (15:48 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 21 Jun 2013 13:48:32 +0000 (15:48 +0200)
commitf8ace40e88eb7063f66697713373ac64cbc1412a
tree955a855c0f0329e9b1f5173f717dcfa474b485b2
parent969ae2ac40288b50a0ff4d84e8bddc2d8cc9d08a
parentc12d82b84353784f8233c28ee43cec0ac9fbd7d2
Merge tag 'zynq-defconfig-for-3.11' of git://git.xilinx.com/linux-xlnx into next/boards

From Michal Simek:

arm: Xilinx Zynq defconfig changes for v3.11

Enable zynq uartps driver and initrd in defconfig.

* tag 'zynq-defconfig-for-3.11' of git://git.xilinx.com/linux-xlnx:
  arm: multi_v7_defconfig: Enable initrd/initramfs support
  arm: multi_v7_defconfig: Enable Zynq UART driver

Signed-off-by: Arnd Bergmann <arnd@arndb.de>