Skip to content
Commit 8ee41a62 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'prima2/pinctrl' into next/pinctrl 

* prima2/pinctrl:
  ARM: prima2: enable gpiolib unconditionally
parents c911a316 f6387092
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment