diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-06-29 17:40:44 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-06-29 17:40:44 +0900 |
commit | 03ef81bf99672413b9ba9f371654562e599dee06 (patch) | |
tree | e8a31b0a051d867e50c44ed3f40d463a5f8e335b /drivers/tty | |
parent | 89576a62b38d53c2080fa25472c85f86189c4557 (diff) | |
parent | 9174fc8f111982e024a00512c521ad8f1056fccb (diff) | |
parent | 6afba9e7fca5ad6a701c13760639faa0906fe487 (diff) | |
download | linux-03ef81bf99672413b9ba9f371654562e599dee06.tar.gz linux-03ef81bf99672413b9ba9f371654562e599dee06.tar.bz2 linux-03ef81bf99672413b9ba9f371654562e599dee06.zip |
Merge branches 'common/serial-rework' and 'sh/stable-updates' into sh-latest