diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-05 10:35:44 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-05 10:35:44 -0700 |
commit | 8901e7ffc2fa78ede7ce9826dbad68a3a25dc2dc (patch) | |
tree | e1a7735557b8d875e5827f889e658d3b5a717848 /arch/m68k/include/asm/delay_mm.h | |
parent | 90975ef71246c5c688ead04e8ff6f36dc92d28b3 (diff) | |
parent | 1359096eacb1971be67eead8bf9b582864d92a30 (diff) |
Merge branch 'bzip2-lzma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip
* 'bzip2-lzma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip:
bzip2/lzma: quiet Kconfig warning for INITRAMFS_COMPRESSION_NONE
Diffstat (limited to 'arch/m68k/include/asm/delay_mm.h')
0 files changed, 0 insertions, 0 deletions