From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 20 Jun 2012 22:13:13 +0000 (-0700)
Subject: Merge tag 'tty-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
X-Git-Tag: Ubuntu-5.2.0-15.16~17769
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=a1821f774d4600727edf71005f259a9fdb73981e;p=mirror_ubuntu-eoan-kernel.git

Merge tag 'tty-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

Pull serial driver fixes from Greg Kroah-Hartman:
 "Here are 3 patches resolving a boot regression (the mop500 fix), a
  build warning fix, and a kernel-doc fix.  All tiny, but should go into
  the final 3.5 release.

  Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"

* tag 'tty-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  serial/amba-pl011: move custom pin control to driver
  serial: fix serial_txx9.c build warning/typo
  serial: fix kernel-doc warnings in 8250.c
---

a1821f774d4600727edf71005f259a9fdb73981e