| commit | 5d40dc18573f0fc1abad859e6475adef45fbc4f8 | |
| author | Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> | |
| Tue, 27 Mar 2012 15:13:25 +0000 (27 17:13 +0200) | ||
| committer | Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> | |
| Tue, 27 Mar 2012 15:13:25 +0000 (27 17:13 +0200) | ||
| tree | 9820a2099641f38027ddb7f2f5215358dd7d1cfe | treesnapshot (tar.gz zip) |
| parent | 4648ffa16e181b8a0bd17c70090252e40146d9db | commitdiff |
| parent | 77a719fa0690d71e83535330ec4af1926e1222e7 | commitdiff |
Merge remote-tracking branch 'origin/3.3/nr-tty' into 3.3/master
Conflicts:
drivers/tty/Kconfig
Conflicts:
drivers/tty/Kconfig
| drivers/tty/Kconfig | diff1 | diff2 | blobhistory |