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

Browse source

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

...

This commit is contained in:

Arnd Bergmann 2015-03-04 23:06:49 +01:00

parent aa5c86ce1d 3cada3a4da

commit 0a9061c330

4 changed files with 8 additions and 5 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

Documentation/devicetree/bindings/arm/amlogic.txt

View file

5

Documentation/devicetree/bindings/arm/geniatech.txt

View file

1

Documentation/devicetree/bindings/vendor-prefixes.txt

View file

3

arch/arm/mach-meson/Kconfig

View file