From: Thierry Reding <treding@nvidia.com>
Date: Thu, 24 Oct 2013 12:59:14 +0000 (+0200)
Subject: Merge remote-tracking branch 'tty/tty-next'
X-Git-Tag: next-20131024~32
X-Git-Url: https://git.karo-electronics.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=bd1db62a010bba690a50738758f017ba563ce459

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

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

bd1db62a010bba690a50738758f017ba563ce459