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)
commit0d34fb8e93ceba7b6dad0062dbb4a0813bacd75b
treed32f847a50e9892be21126a43b6c781379a44441
parent503e57630309643562c12f09d4c8a96eb629ee33
parent40297927575a50b1d0d308d735c445924d33fba6
Merge branch 'bzip2-lzma-for-linus' of git://git./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