Merge tag 'omap-for-v3.11/board-signed' of git://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Thu, 20 Jun 2013 19:37:55 +0000 (21:37 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 20 Jun 2013 19:37:55 +0000 (21:37 +0200)
From Tony Lindgren:

Minor board changes for v3.11 merge window. These are
tapering down finally as we're getting closer to making
omap2+ DT only.

* tag 'omap-for-v3.11/board-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: omap2plus_defconfig: enable USB_PHY and NOP_USB_XCEIV
  ARM: OMAP1: nokia770: enable Tahvo
  ARM: OMAP3EVM: Marking omap3_evm_display_init() with CONFIG_BROKEN
  arm: omap: board-overo: reset GPIO for SMSC911x

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Trivial merge