Merge tag 'tty-3.3-rc3' tty-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 10 Feb 2012 18:23:43 +0000 (10:23 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 10 Feb 2012 18:25:27 +0000 (10:25 -0800)
commit5a22e30def8b9539576ff047adb14455ca559f07
treee1e76efd73b28e7ae8124383c263fcf92bcc11e0
parent19e00f2f1d5273dbc52eab0ebc315cae3aa44b2a
parent418a936e84e8f346da322c2e839992aa9df108d4
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>
drivers/tty/serial/8250/8250.c
drivers/tty/serial/Kconfig
drivers/tty/serial/Makefile