Skip to content
Commit 989b7135 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'spear/pinctrl' into next/pinctrl

This is a rebased version of some contents of
  git://git.stlinux.com/spear/linux-2.6.git

 spear-v3.5
which was accidentally sent against linux-next rather than an
-rc release.

The commits are based on other changes in the spear/dt branch
of the arm-soc tree that they depend on.

* spear/pinctrl:
  SPEAr3xx: Add pinctrl support for boards
  SPEAr: Remove existing padmux support for SPEAr
  pinctrl: Add SPEAr3xx pinctrl drivers
  pinctrl: Add SPEAr pinctrl drivers

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents e816b57a e0373607
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment