From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 4 Mar 2015 22:06:49 +0000 (+0100)
Subject: Merge tag 'for-v4.0-rc/meson-soc' of https://github.com/carlocaione/linux-meson into... 
X-Git-Tag: v4.1-rc1~51^2~18
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=0a9061c3304bd74f74409e2bb49f70872afad2d8;p=linux.git

Merge tag 'for-v4.0-rc/meson-soc' of https://github.com/carlocaione/linux-meson into next/soc

Pull "meson SoC changes" from Carlo Caione:

- Add some forgotten documentation
- Kconfig changes to enable PINCTRL

* tag 'for-v4.0-rc/meson-soc' of https://github.com/carlocaione/linux-meson:
  of: Define board compatible for MINIX NEO-X8
  of: Add vendor prefix for MINIX
  ARM: meson: select PINCTRL_MESON and ARCH_REQUIRE_GPIOLIB
---

0a9061c3304bd74f74409e2bb49f70872afad2d8