From: Kevin Hilman Date: Thu, 19 Dec 2013 15:33:57 +0000 (-0800) Subject: Merge tag 'mvebu-dt-3.14-3' of git://git.infradead.org/linux-mvebu into next/dt X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=718133a63714fb6051fa44932375ffafb44114f3;p=linux.git Merge tag 'mvebu-dt-3.14-3' of git://git.infradead.org/linux-mvebu into next/dt From Jason Cooper: mvebu DT changes for v3.14 (incr. #3) - kirkwood - use symbolic names for gpios and key inputs - mvebu - add the pxa nand controller to the ReadyNAS and A370-RD boards * tag 'mvebu-dt-3.14-3' of git://git.infradead.org/linux-mvebu: ARM: mvebu: Enable NAND controller in A370 Reference Design board ARM: mvebu: Enable NAND controller in ReadyNAS 2120 .dts file ARM: mvebu: Enable NAND controller in ReadyNAS 104 .dts file ARM: mvebu: Enable NAND controller in ReadyNAS 102 .dts file ARM: DT: Kirkwood: Use symbolic names from gpio.h ARM: DT: Kirkwood: Use symbolic names from input.h Signed-off-by: Kevin Hilman --- 718133a63714fb6051fa44932375ffafb44114f3