From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 29 Mar 2009 20:05:41 +0000 (-0700)
Subject: Merge branch 'bzip2-lzma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0d34fb8e93ceba7b6dad0062dbb4a0813bacd75b;p=linux-2.6-omap-h63xx.git

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
---

0d34fb8e93ceba7b6dad0062dbb4a0813bacd75b