Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 29 Nov 2010 22:36:07 +0000 (14:36 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 29 Nov 2010 22:36:07 +0000 (14:36 -0800)
commita9735c81a43054a7e8cb8771c8e04c01fcacde10
tree53d0fa7f31240a95eb7a77cd555d87ce9c20472e
parentaa3fc52546b847f590d86a093afd863ff9081628
parent0d8e2d0dad98a693bad88aea6876ac8b94ad95c6
Merge branch 'omap-fixes-for-linus' of git://git./linux/kernel/git/tmlind/linux-omap-2.6

* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
  OMAP2+: PM/serial: hold console semaphore while OMAP UARTs are disabled
  OMAP: UART: don't resume UARTs that are not enabled.