diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-01 11:45:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-01 11:45:48 -0700 |
| commit | 10027471a305c5491d23add394041120720e8a11 (patch) | |
| tree | 9e3c91a56ba45d4beb26f8ae84021b1897da460d /net/can | |
| parent | 61434392f797cf89872bda87dff8b3395edf4108 (diff) | |
| parent | 26b63e995113dd48fde66c0d0d65eecc6df53172 (diff) | |
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.
Diffstat (limited to 'net/can')
0 files changed, 0 insertions, 0 deletions