Merge tag 'imx-fixes-3.9-3' of git://git.linaro.org/people/shawnguo/linux-2.6 into...
authorArnd Bergmann <arnd@arndb.de>
Thu, 21 Mar 2013 16:39:59 +0000 (17:39 +0100)
committerArnd Bergmann <arnd@arndb.de>
Thu, 21 Mar 2013 16:40:07 +0000 (17:40 +0100)
commita8d03eb42b8d071696494c1cb23a2c16e5219059
tree3e05a928903d31b8a276fa6cf8e1f1d269209dbe
parenta4ba740d4179f95aa6c95ce7c935d3bf451c6381
parent287939a3690c8da6fd3310d7593ff0448cb9447c
Merge tag 'imx-fixes-3.9-3' 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 3:
 - Add the lost dependency check for DEBUG_IMX_UART_PORT back

* tag 'imx-fixes-3.9-3' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: imx: add dependency check for DEBUG_IMX_UART_PORT

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