summaryrefslogtreecommitdiffstats
path: root/arch/sh
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2011-10-28 07:18:10 +0200
committerPaul Mundt <lethal@linux-sh.org>2011-10-28 07:18:10 +0200
commit9060c05b503d9aa2c271d8946132a3ab2882bff2 (patch)
treed6ffa62356ce6ba7b198d9ad2e5f838cb2cfbe73 /arch/sh
parentMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval... (diff)
parentsh: Fix implicit declaration of function numa_node_id (diff)
parentsh: kexec: Register crashk_res (diff)
downloadlinux-9060c05b503d9aa2c271d8946132a3ab2882bff2.tar.xz
linux-9060c05b503d9aa2c271d8946132a3ab2882bff2.zip
Merge branches 'sh/core' and 'sh/kexec' into sh-latest