]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
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)
* '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


Trivial merge