From: Linus Torvalds Date: Mon, 29 Nov 2010 22:36:07 +0000 (-0800) Subject: Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: firefly_0821_release~7613^2~3328 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a9735c81a43054a7e8cb8771c8e04c01fcacde10;p=firefly-linux-kernel-4.4.55.git 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. --- a9735c81a43054a7e8cb8771c8e04c01fcacde10