Merge branch 'sh/stable-updates'
authorPaul Mundt <lethal@linux-sh.org>
Mon, 26 Oct 2009 01:48:18 +0000 (10:48 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Mon, 26 Oct 2009 01:48:18 +0000 (10:48 +0900)
commit6253195b671b98a4e5da5d39c2df9f8f257bcea1
tree3b7ca1d8ef5d9c50a77abf1d1cf5b2b5aa243284
parent15893fb565921507da80e500d85bb2575989bb57
parent60339fad5c68c9c533cd14e67194ff8f727c41d9
Merge branch 'sh/stable-updates'

Conflicts:
arch/sh/kernel/dwarf.c
arch/sh/kernel/dwarf.c
arch/sh/kernel/irq.c
arch/sh/kernel/sh_ksyms_32.c