tree d1aaecf81d1357b5920579347e6bb894b4bfe11c
parent 9987f76ad286887978803ece6cdcf34582279a29
parent d0e639c9e06d44e713170031fe05fb60ebe680af
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1381105696 -0700
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1381105696 -0700

Merge 3.12-rc4 into tty-next

We want the tty fixes in this branch as well.

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