Merge branch 'bzip2-lzma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 5 Apr 2009 17:35:44 +0000 (10:35 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 5 Apr 2009 17:35:44 +0000 (10:35 -0700)
commit8901e7ffc2fa78ede7ce9826dbad68a3a25dc2dc
treee1a7735557b8d875e5827f889e658d3b5a717848
parent90975ef71246c5c688ead04e8ff6f36dc92d28b3
parent1359096eacb1971be67eead8bf9b582864d92a30
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: quiet Kconfig warning for INITRAMFS_COMPRESSION_NONE