Merge tag 'versatile-flash-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Mon, 25 Apr 2016 21:41:01 +0000 (23:41 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 25 Apr 2016 21:43:25 +0000 (23:43 +0200)
commit26a8eb59e0a8da5a662d7c22334af9952edbf6ab
treedc8a01ea2c7908b797236cf5b276c7f303c63911
parenta961bf24ba7137a223475c24a5b222112a1f1b88
parent91011a7605822cd9c16eabcd1cc11ae31d604bfd
Merge tag 'versatile-flash-for-arm-soc' of git://git./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 <computersforpeace@gmail.com>