diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-15 14:00:05 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-15 14:00:05 -0400 |
commit | 0de19a456cb59106420864927fdec152310f70b6 (patch) | |
tree | f83c05aa493720736a329afad301251a087cc5b2 /block/ioctl.c | |
parent | abe2f41430770270a1512bf78f489284bfbdbd04 (diff) | |
parent | fd785d6b18b930b76ad5076eed6e9af43195b281 (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: 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
Diffstat (limited to 'block/ioctl.c')
0 files changed, 0 insertions, 0 deletions