diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-05-09 22:51:07 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-05-09 22:51:07 -0400 |
| commit | 15f99cbd071aa402e113d342448603344a337046 (patch) | |
| tree | 56f98892d1bd38029988eb8931e2321ef7e79aa0 /arch/sh/include/asm/io.h | |
| parent | b2212ea41dacda8cce0e7681a3a6ccc76c63802e (diff) | |
| parent | 41797f75486d8ca3b98d7658c2a506ac7879a8e5 (diff) | |
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/sh/include/asm/io.h')
0 files changed, 0 insertions, 0 deletions