From: Arnd Bergmann Date: Mon, 25 Apr 2016 21:41:01 +0000 (+0200) Subject: Merge tag 'versatile-flash-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: v4.7-rc1~133^2~19 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=26a8eb59e0a8da5a662d7c22334af9952edbf6ab;p=karo-tx-linux.git Merge tag 'versatile-flash-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/drivers Merge "move Versatile flash protection to the device tree" from Linus Walleij: This is a set of patches removing the board file code for Versatile flash handling and instead moving it over to the device tree and a special add-on file. * tag 'versatile-flash-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator: ARM: integrator: move flash registration to device tree ARM: versatile: move flash registration to the device tree mtd: augment the "arm,versatile-flash" bindings mtd: physmap_of: add a hook for Versatile write protection Acked-by: Brian Norris --- 26a8eb59e0a8da5a662d7c22334af9952edbf6ab