From: Linus Torvalds Date: Mon, 19 May 2008 23:33:08 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 X-Git-Tag: v2.6.26-rc4~119 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=db07b02304d0d70bf8273abc93d94e4c8d2f9cec;p=linux-2.6-omap-h63xx.git Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: sh: Fix up restorer in debug_trap exception return path. sh: Make is_valid_bugaddr() more intelligent on nommu. sh: use the common ascii hex helpers sh: fix sh7785 master clock value sh: Fix up thread info pointer in syscall_badsys resume path. sh: Fix up optimized SH-4 memcpy on big endian. sh: disable initrd defaults in .empty_zero_page. sh: display boot params by default on entry. --- db07b02304d0d70bf8273abc93d94e4c8d2f9cec