From: Thierry Reding <treding@nvidia.com>
Date: Fri, 25 Oct 2013 09:48:03 +0000 (+0200)
Subject: Merge remote-tracking branch 'tty/tty-next'
X-Git-Tag: next-20131025~23
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e5abb592b918ce7100512d0ebf4c6e0e18fe7a35;p=karo-tx-linux.git

Merge remote-tracking branch 'tty/tty-next'

Conflicts:
	drivers/tty/serial/atmel_serial.c
	drivers/tty/serial/imx.c
---

e5abb592b918ce7100512d0ebf4c6e0e18fe7a35