]> Pileus Git - ~andy/linux/commitdiff
Merge branch 'spear/pinctrl' into next/pinctrl
authorArnd Bergmann <arnd@arndb.de>
Sun, 22 Apr 2012 20:51:44 +0000 (22:51 +0200)
committerArnd Bergmann <arnd@arndb.de>
Sun, 22 Apr 2012 20:51:44 +0000 (22:51 +0200)
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: Arnd Bergmann <arnd@arndb.de>

Trivial merge