tree d787abcbead1439d3f82f0719efe520fd9689f79
parent dbf5bef8da169b38db804996a661f8d634df8295
parent 949db153b6466c6f7cad5a427ecea94985927311
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1359149256 -0800
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1359149256 -0800

Merge 3.8-rc5 into tty-next

This resolves a number of tty driver merge issues found in linux-next

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