diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-05 19:35:44 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-05 19:35:44 +0200 |
commit | 8901e7ffc2fa78ede7ce9826dbad68a3a25dc2dc (patch) | |
tree | e1a7735557b8d875e5827f889e658d3b5a717848 /arch/alpha/include/asm/shmparam.h | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask (diff) | |
parent | bzip2/lzma: quiet Kconfig warning for INITRAMFS_COMPRESSION_NONE (diff) | |
download | linux-8901e7ffc2fa78ede7ce9826dbad68a3a25dc2dc.tar.xz linux-8901e7ffc2fa78ede7ce9826dbad68a3a25dc2dc.zip |
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/alpha/include/asm/shmparam.h')
0 files changed, 0 insertions, 0 deletions