| commit | 467a3ca5cab64a16b5ec46ebb1895c84c280dcfe | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Jul 16 12:32:42 2012 -0700 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Jul 16 12:32:42 2012 -0700 |
| tree | 68096d5b17e884d270420d50e466186c73019830 | |
| parent | 40c9f61eae9098212b6906f29f30f08f7a19b5e2 [diff] | |
| parent | 84a1caf1453c3d44050bd22db958af4a7f99315c [diff] |
Merge branch 'v3.6-rc7' into tty-next This is to sync up on Linus's branch to get the other tty and core changes. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>