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)
Conflicts:
arch/sh/kernel/dwarf.c


Trivial merge