From: Olof Johansson Date: Thu, 3 Oct 2013 03:55:05 +0000 (-0700) Subject: Merge tag 'fixes-3.12-2' of git://git.infradead.org/linux-mvebu into fixes X-Git-Tag: v3.12-rc4~25^2 X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=6a98b2ffc7cf8a84a18d8666185c29b7e0e631e9 Merge tag 'fixes-3.12-2' of git://git.infradead.org/linux-mvebu into fixes From Jason Cooper: mvebu fixes for v3.12 (round 2) - mvebu - fix ReadyNAS 102 power button (needs to be active high) - fix ReadyNAS 102 automated rebooting (prevent hang) by add gpio-poweroff node - fix booting ReadyNAS 102 by adding MBus ranges and PCIe DT nodes - mvebu-mbus: prevent PCIe driver from continuing with corrupted resource * tag 'fixes-3.12-2' of git://git.infradead.org/linux-mvebu: bus: mvebu-mbus: Fix optional pcie-mem/io-aperture properties ARM: mvebu: add missing DT Mbus ranges and relocate PCIe DT nodes for RN102 ARM: mvebu: Add DT entry for ReadyNAS 102 to use gpio-poweroff driver ARM: mvebu: fix ReadyNAS 102 Power button GPIO to make it active high Signed-off-by: Olof Johansson --- 6a98b2ffc7cf8a84a18d8666185c29b7e0e631e9