From: Olof Johansson Date: Thu, 26 Sep 2013 04:21:38 +0000 (-0700) Subject: Merge tag 'for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f7df257a2cb0856aa3375316e8cc6d40c2c9cbe4;p=linux-beck.git Merge tag 'for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into next/cleanup From Linus Walleij: These three patches tear out the remaining AUXDATA in the Nomadik platform and replace it with device tree. Corresponding driver changes are coming from respective subsystem tree and there are no build dependencies. - Update device tree for VMMC regulator data - Supply SD/MMC voltage from the VMMC regulator - Delete auxdata for SD/MMC card and rely on DT only - Update device tree for FSMC NAND merged for v3.12-rc1 - Delete auxdata for FSMC NAND * tag 'for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik: ARM: nomadik: delete FSMC platform data ARM: nomadik: delete MMCI platform data ARM: nomadik: register VMMC regulator Signed-off-by: Olof Johansson --- f7df257a2cb0856aa3375316e8cc6d40c2c9cbe4