Merge branch 'sh/dwarf-unwinder'
authorPaul Mundt <lethal@linux-sh.org>
Sun, 11 Oct 2009 23:50:07 +0000 (08:50 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Sun, 11 Oct 2009 23:50:07 +0000 (08:50 +0900)
commit8ec006c58775869175edee3d23f4525b6df2935a
treee70b8d0d191cd97276aa4b370e055485a6a98010
parent3d4e0cfb3372ee7754f743ab90944540cef4ecc6
parent5ab78ff693d09a6ffc7ca80ad600b2f5feb89d7f
Merge branch 'sh/dwarf-unwinder'

Conflicts:
arch/sh/kernel/dwarf.c
arch/sh/include/asm/dwarf.h
arch/sh/kernel/dwarf.c