diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-10-28 07:18:10 +0200 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-10-28 07:18:10 +0200 |
commit | 9060c05b503d9aa2c271d8946132a3ab2882bff2 (patch) | |
tree | d6ffa62356ce6ba7b198d9ad2e5f838cb2cfbe73 /arch/sh | |
parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval... (diff) | |
parent | sh: Fix implicit declaration of function numa_node_id (diff) | |
parent | sh: kexec: Register crashk_res (diff) | |
download | linux-9060c05b503d9aa2c271d8946132a3ab2882bff2.tar.xz linux-9060c05b503d9aa2c271d8946132a3ab2882bff2.zip |
Merge branches 'sh/core' and 'sh/kexec' into sh-latest