Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.25
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 1 Apr 2008 18:45:48 +0000 (11:45 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 1 Apr 2008 18:45:48 +0000 (11:45 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.25:
  sh: Fix up uImage compression type
  remove include/asm-sh/floppy.h
  sh: Fix TIF_USEDFPU clearing under FPU emulation.
  sh: Fix occasional FPU register corruption under preempt.


Trivial merge