From: Olof Johansson Date: Sun, 9 Nov 2014 00:59:39 +0000 (-0800) Subject: Merge tag 'nomadik-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw... X-Git-Tag: v3.19-rc1~57^2~20 X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=17908a13a48128adacf779348a3ba1f77c55a2c1 Merge tag 'nomadik-for-v3.19' of git://git./linux/kernel/git/linusw/linux-nomadik into next/dt Merge "Nomadik updates for the v3.19 series" from Linus Walleij: Nomadik changes for the v3.19 development series: - Rearrange the DTS files to make a pure SoC-specific file and a pure board file for S8815. - Add the device tree for the NDK15 board. - Update the defconfig and configure in the STMPE expander by default on the Nomadik. * tag 'nomadik-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik: ARM: nomadik: configure in STMPE support ARM: update Nomadik config ARM: nomadik: device tree for NHK15 board ARM: nomadik: push ethernet down to board ARM: nomadik: set up MCDATDIR2 ARM: nomadik: move GPIO I2C to S8815 board file ARM: nomadik: disable chrystals in top level board files ARM: nomadik: move MMC/SD card detect GPIO to board DTS Signed-off-by: Olof Johansson --- 17908a13a48128adacf779348a3ba1f77c55a2c1