From: Linus Torvalds Date: Fri, 14 Sep 2012 21:54:29 +0000 (-0700) Subject: Merge tag 'tty-3.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=fe59d297eaf59d3f9b4c161b9d17ff16250b6c9e;p=~shefty%2Frdma-dev.git Merge tag 'tty-3.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty Pull TTY fixes from Greg Kroah-Hartman: "Here are 2 tiny patches for a serial driver to resolve issues that people have reported with the 3.6-rc tree. Both of these have been in the linux-next tree for a while now. Signed-off-by: Greg Kroah-Hartman " * tag 'tty-3.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: tty: serial: imx: don't reinit clock in imx_setup_ufcr() tty: serial: imx: console write routing is unsafe on SMP --- fe59d297eaf59d3f9b4c161b9d17ff16250b6c9e