summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2011-06-29 10:40:44 +0200
committerPaul Mundt <lethal@linux-sh.org>2011-06-29 10:40:44 +0200
commit03ef81bf99672413b9ba9f371654562e599dee06 (patch)
treee8a31b0a051d867e50c44ed3f40d463a5f8e335b /arch
parentMerge branch 'sh/stable-updates' into sh-latest (diff)
parentserial: sh-sci: Fix up pretty name printing for port IRQs. (diff)
parentsh: fix the value of sh_dmae_slave_config in setup-sh7757 (diff)
downloadlinux-03ef81bf99672413b9ba9f371654562e599dee06.tar.xz
linux-03ef81bf99672413b9ba9f371654562e599dee06.zip
Merge branches 'common/serial-rework' and 'sh/stable-updates' into sh-latest