aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-11-29 14:36:07 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-11-29 14:36:07 -0800
commita9735c81a43054a7e8cb8771c8e04c01fcacde10 (patch)
tree53d0fa7f31240a95eb7a77cd555d87ce9c20472e /net
parentaa3fc52546b847f590d86a093afd863ff9081628 (diff)
parent0d8e2d0dad98a693bad88aea6876ac8b94ad95c6 (diff)
downloadmrst-s0i3-test-a9735c81a43054a7e8cb8771c8e04c01fcacde10.tar.gz
mrst-s0i3-test-a9735c81a43054a7e8cb8771c8e04c01fcacde10.tar.xz
mrst-s0i3-test-a9735c81a43054a7e8cb8771c8e04c01fcacde10.zip
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.
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions