Merge tag 'omap-for-v3.13/pinctrl-fix' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Sat, 19 Oct 2013 00:30:19 +0000 (17:30 -0700)
committerOlof Johansson <olof@lixom.net>
Sat, 19 Oct 2013 00:30:19 +0000 (17:30 -0700)
commit1e819b3ed3faa81f7996b8fb5690ab35b4a0fa2e
tree2b927c40ffd7c0525595a4be51121d706ee94202
parentee4383e0c1e3285b3a8b47c801b2941166f035c3
parent1b9c0fb365cbb1154f4e7997061db972cbf58300
Merge tag 'omap-for-v3.13/pinctrl-fix' of git://git./linux/kernel/git/tmlind/linux-omap into next/dt

From Tony Lindgren:

Looks like I managed to break the x86 build for some
configs. Here's a fix for that on top of the pinctrl
changes already merged with the signed tag
omap-for-v3.13/quirk-signed.

* tag 'omap-for-v3.13/pinctrl-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  pinctrl: single: Fix build when not built on ARM

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