Merge tag 'ux500-pinctrl-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Fri, 14 Jun 2013 23:52:10 +0000 (16:52 -0700)
committerOlof Johansson <olof@lixom.net>
Fri, 14 Jun 2013 23:52:10 +0000 (16:52 -0700)
From Linus Walleij:
Ux500 pinctrl changes:
- Updates to MSP pinctrl entry for ALSA SoC
- ABx500 pinctrl tables

* tag 'ux500-pinctrl-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  ARM: ux500: add ABx500 pinctrl tables
  ARM: ux500: update MSP1 pinctrl defintions

Signed-off-by: Olof Johansson <olof@lixom.net>

Trivial merge