summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2012-03-30 12:53:33 +0200
committerPaul Mundt <lethal@linux-sh.org>2012-03-30 12:53:33 +0200
commit915ab1771b6544af872a198500b15d95b74b9106 (patch)
tree3b4856dd9a1726f31be613f05d930a1ac50c1a21
parentsh: dma: Fix up device attribute mismatch from sysdev fallout. (diff)
parentsh: vsyscall: Fix up .eh_frame generation. (diff)
parentserial: sh-sci: use serial_port_in/out vs sci_in/out. (diff)
downloadlinux-915ab1771b6544af872a198500b15d95b74b9106.tar.xz
linux-915ab1771b6544af872a198500b15d95b74b9106.zip
Merge branches 'sh/urgent', 'sh/vsyscall' and 'common/serial-rework' into sh-latest