diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-27 00:15:31 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-27 00:15:31 +0100 |
commit | 4496d937a518fde0d0e1980e4ab470cedb4b50cd (patch) | |
tree | a02d57e13b44483417973a306f9fd23743959375 /arch/x86/kernel/vmi_32.c | |
parent | Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6 (diff) | |
parent | m68k: irq_node.handler() should return irqreturn_t (diff) | |
download | linux-4496d937a518fde0d0e1980e4ab470cedb4b50cd.tar.xz linux-4496d937a518fde0d0e1980e4ab470cedb4b50cd.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: irq_node.handler() should return irqreturn_t
m68k: section mismatch fixes: Atari SCSI
m68k: section mismatch fixes: DMAsound for Atari
MAINTAINERS: Replace dead link to m68k CVS repository by link to new git repository
m68k: mac - Add SWIM floppy support
m68k: mac - Add a new entry in mac_model to identify the floppy controller type.
m68k: Add install target
Diffstat (limited to 'arch/x86/kernel/vmi_32.c')
0 files changed, 0 insertions, 0 deletions