diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-29 22:05:41 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-29 22:05:41 +0200 |
commit | 0d34fb8e93ceba7b6dad0062dbb4a0813bacd75b (patch) | |
tree | d32f847a50e9892be21126a43b6c781379a44441 /kernel/kmod.c | |
parent | Fix build error in <linux/irq.h> (diff) | |
parent | bzip2/lzma: don't ask for compression mode for the default initramfs (diff) | |
download | linux-0d34fb8e93ceba7b6dad0062dbb4a0813bacd75b.tar.xz linux-0d34fb8e93ceba7b6dad0062dbb4a0813bacd75b.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: don't ask for compression mode for the default initramfs
bzip2/lzma: consistently capitalize LZMA in Kconfig
bzip2/lzma: clarify the meaning of the CONFIG_RD_ options
bzip2/lzma: move CONFIG_RD_* options under CONFIG_EMBEDDED
Diffstat (limited to 'kernel/kmod.c')
0 files changed, 0 insertions, 0 deletions