From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 15 Apr 2008 18:00:05 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.25
X-Git-Tag: v2.6.25~28
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0de19a456cb59106420864927fdec152310f70b6;p=linux-2.6

Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.25

* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.25:
  sh: export empty_zero_page
  sh: arch/sh/kernel/traps_32.c needs asm/fpu.h
  sh: fix compressed kernel build
  sh64: add missing #include <asm/fpu.h>'s
---

0de19a456cb59106420864927fdec152310f70b6