diff options
author | Paul Mundt <lethal@linux-sh.org> | 2012-03-30 19:53:33 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2012-03-30 19:53:33 +0900 |
commit | 915ab1771b6544af872a198500b15d95b74b9106 (patch) | |
tree | 3b4856dd9a1726f31be613f05d930a1ac50c1a21 /arch | |
parent | 87c34ed3aba9249cb06d1a1f100cd3618f29268c (diff) | |
parent | cd34e202faa4be7f77fd2f7a59824f13dc14901b (diff) | |
parent | b12bb29f847050b8e75e445c839a2d42989213df (diff) | |
download | linux-915ab1771b6544af872a198500b15d95b74b9106.tar.gz linux-915ab1771b6544af872a198500b15d95b74b9106.tar.bz2 linux-915ab1771b6544af872a198500b15d95b74b9106.zip |
Merge branches 'sh/urgent', 'sh/vsyscall' and 'common/serial-rework' into sh-latest