tree e1e76efd73b28e7ae8124383c263fcf92bcc11e0
parent 19e00f2f1d5273dbc52eab0ebc315cae3aa44b2a
parent 418a936e84e8f346da322c2e839992aa9df108d4
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1328898223 -0800
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1328898327 -0800

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>