From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 17 Oct 2013 17:37:42 +0000 (-0700)
Subject: Merge tag 'tty-3.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
X-Git-Tag: v3.12-rc6~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7b4a51550981d7602a5e1209b53a67c817c85999;p=kernel%2Fkernel-generic.git

Merge tag 'tty-3.12-rc6' of git://git./linux/kernel/git/gregkh/tty

Pull serial driver fixes from Greg KH:
 "Here are two serial driver fixes for your tree.  One is a revert of a
  patch that causes a build error, the other is a fix to provide the
  correct brace placement which resolves a bug where the driver was not
  working properly"

* tag 'tty-3.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  serial: vt8500: add missing braces
  Revert "serial: i.MX: evaluate linux,stdout-path property"
---

7b4a51550981d7602a5e1209b53a67c817c85999