| commit | f8ace40e88eb7063f66697713373ac64cbc1412a | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Fri Jun 21 15:48:32 2013 +0200 |
| committer | Arnd Bergmann <arnd@arndb.de> | Fri Jun 21 15:48:32 2013 +0200 |
| tree | 955a855c0f0329e9b1f5173f717dcfa474b485b2 | |
| parent | 969ae2ac40288b50a0ff4d84e8bddc2d8cc9d08a [diff] | |
| parent | c12d82b84353784f8233c28ee43cec0ac9fbd7d2 [diff] |
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>