diff options
author | Paul Mundt <lethal@linux-sh.org> | 2012-05-10 04:51:07 +0200 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2012-05-10 04:51:07 +0200 |
commit | 15f99cbd071aa402e113d342448603344a337046 (patch) | |
tree | 56f98892d1bd38029988eb8931e2321ef7e79aa0 /arch/mips/include/asm/fw | |
parent | sh64: Kill off unused trap_no/error_code from thread_struct. (diff) | |
parent | sh: Add pinmux for sh7264 (diff) | |
download | linux-15f99cbd071aa402e113d342448603344a337046.tar.xz linux-15f99cbd071aa402e113d342448603344a337046.zip |
Merge branch 'sh/rsk-updates' into sh-latest
Conflicts:
arch/sh/Kconfig
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/mips/include/asm/fw')
0 files changed, 0 insertions, 0 deletions