From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 5 Apr 2009 17:35:44 +0000 (-0700)
Subject: Merge branch 'bzip2-lzma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=8901e7ffc2fa78ede7ce9826dbad68a3a25dc2dc;hp=-c;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: quiet Kconfig warning for INITRAMFS_COMPRESSION_NONE
---

8901e7ffc2fa78ede7ce9826dbad68a3a25dc2dc