From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 10 Feb 2012 18:23:43 +0000 (-0800)
Subject: Merge tag 'tty-3.3-rc3' tty-next
X-Git-Tag: v3.4-rc1~185^2~112
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5a22e30def8b9539576ff047adb14455ca559f07;p=thirdparty%2Flinux.git

Merge tag 'tty-3.3-rc3' tty-next

This is needed to handle the 8250 file merge mess properly for future
patches.

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

5a22e30def8b9539576ff047adb14455ca559f07