tree 9e3c91a56ba45d4beb26f8ae84021b1897da460d
parent 61434392f797cf89872bda87dff8b3395edf4108
parent 26b63e995113dd48fde66c0d0d65eecc6df53172
author Linus Torvalds <torvalds@linux-foundation.org> 1207075548 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1207075548 -0700

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: 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.