Merge tag 'omap-for-v3.11/pm-serial-signed' of git://git.kernel.org/pub/scm/linux...
authorArnd Bergmann <arnd@arndb.de>
Thu, 20 Jun 2013 14:40:14 +0000 (16:40 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 20 Jun 2013 14:40:14 +0000 (16:40 +0200)
commit60d808ddff97071ee4c3e1d13454642f3d0e8ae1
treedb1fbf6694ae4419f264a8919653f8540c80c44d
parent412bb1c1d5cc7790cf048f7b019caca3bce2fb39
parent1e383d7bdd988b1453a3a86f5e14b012700f7dff
Merge tag 'omap-for-v3.11/pm-serial-signed' of git://git./linux/kernel/git/tmlind/linux-omap into next/cleanup

From Tony Lindgren:

Serial driver platform init code clean-up via Kevin Hilman <khilman@linaro.org>:

OMAP: PM: the serial core + driver can no handle no_console_suspend support
without any SoC specific handlding or SoC-specific DT bindings.  Remove
the now unused SoC specifics for OMAP.

* tag 'omap-for-v3.11/pm-serial-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  arm: omap2+: omap_device: remove no_idle_on_suspend
  arm: dts: am33xx: Remove "ti,no_idle_on_suspend" property.
  arm: omap2+: serial: remove no_console_suspend support

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/boot/dts/am33xx.dtsi
arch/arm/mach-omap2/serial.c