tree 53d0fa7f31240a95eb7a77cd555d87ce9c20472e
parent aa3fc52546b847f590d86a093afd863ff9081628
parent 0d8e2d0dad98a693bad88aea6876ac8b94ad95c6
author Linus Torvalds <torvalds@linux-foundation.org> 1291070167 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1291070167 -0800

Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/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.