diff options
author | Paul Mundt <lethal@linux-sh.org> | 2012-03-30 12:53:33 +0200 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2012-03-30 12:53:33 +0200 |
commit | 915ab1771b6544af872a198500b15d95b74b9106 (patch) | |
tree | 3b4856dd9a1726f31be613f05d930a1ac50c1a21 | |
parent | sh: dma: Fix up device attribute mismatch from sysdev fallout. (diff) | |
parent | sh: vsyscall: Fix up .eh_frame generation. (diff) | |
parent | serial: sh-sci: use serial_port_in/out vs sci_in/out. (diff) | |
download | linux-915ab1771b6544af872a198500b15d95b74b9106.tar.xz linux-915ab1771b6544af872a198500b15d95b74b9106.zip |
Merge branches 'sh/urgent', 'sh/vsyscall' and 'common/serial-rework' into sh-latest