Merge branch 'platform-base-3.8.y' of git://git.ti.com/~rrnayak/ti-linux-kernel/platf...
authorDan Murphy <dmurphy@ti.com>
Tue, 21 May 2013 14:26:30 +0000 (09:26 -0500)
committerDan Murphy <dmurphy@ti.com>
Tue, 21 May 2013 14:26:30 +0000 (09:26 -0500)
commitf0c3968e54b5fd3d1c6751352a67383eedf01058
tree1b8d1277ad342cec1af92e8b4088facc642bf8cc
parentf393eafdf4cf08f3d405457684ccea9e2ae48ea5
parent22ccdbdebbaa30398cf074d4e9eedb769953965e
Merge branch 'platform-base-3.8.y' of git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree into ti-linux-3.8.y

TI-Feature: platform_base
TI-Tree: git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree.git
TI-Branch: platform-base-3.8.y

* 'platform-base-3.8.y' of git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree:
  arm: omap2+: omap_device: remove no_idle_on_suspend
  arm: omap2+: serial: remove no_console_suspend support
  driver: serial: omap: prevent runtime PM for "no_console_suspend"
  driver: tty: serial: Move "uart_console" def to core header file.

Signed-off-by: Dan Murphy <dmurphy@ti.com>
drivers/tty/serial/omap-serial.c
drivers/tty/serial/serial_core.c