]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'bzip2-lzma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 29 Mar 2009 20:05:41 +0000 (13:05 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 29 Mar 2009 20:05:41 +0000 (13:05 -0700)
commitcc86f8ffa65d4c099751b519d3776b6f0b881885
treed32f847a50e9892be21126a43b6c781379a44441
parent79ea8f652c6be003c6f2ed0ced917312b5b1169d
parent8a7e3b19820da644f72848360953d4e054994aee
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