Merge tag 'imx-fixes-3.9-4' of git://git.linaro.org/people/shawnguo/linux-2.6 into...
authorArnd Bergmann <arnd@arndb.de>
Thu, 28 Mar 2013 10:54:33 +0000 (11:54 +0100)
committerArnd Bergmann <arnd@arndb.de>
Thu, 28 Mar 2013 10:55:23 +0000 (11:55 +0100)
commitfb5d932ac249a9482672b5e783fc1a91fac4a455
treed6ba3c39421f728414bd7f1e1bae4b2f9d69e736
parentcba26c5ab991768cb7c2d6e96952f1226818fb41
parent2f3edfd7e27ad4206acbc2ae99c9df5f46353024
Merge tag 'imx-fixes-3.9-4' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes

From Shawn Guo <shawn.guo@linaro.org>:

The imx fixes for 3.9, take 4:

Running suspend/resume without no_console_suspend setting on kernel
cmdline will likely makes system hang.  It causesd by the sync issue
between imx_cpu_die() and imx_cpu_kill() call.  Fix the issue by
synchronizing the calls using cpu jumping argument register which is
free to use in kernel.

* tag 'imx-fixes-3.9-4' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: imx: fix sync issue between imx_cpu_die and imx_cpu_kill
  ARM: imx: add dependency check for DEBUG_IMX_UART_PORT

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