Merge branch 'linus' into x86/setup-lzma

Conflicts:
	init/do_mounts_rd.c

diff --cc init/Kconfig
Simple merge

diff --cc init/do_mounts_rd.c
index a06ed4f92e0eeef1551611944700bc700b042b01,0f0f0cf3ba9aa97c34d88824fbf4644ca76b0fac..a015e267fd170ff57f1713459c6d72af98e4b516
--- 1/init/do_mounts_rd.c
--- 2/init/do_mounts_rd.c
+++ b/init/do_mounts_rd.c
@@@ -9,10 -9,8 +9,11 @@@
  #include <linux/string.h>
  
  #include "do_mounts.h"
+ #include "../fs/squashfs/squashfs_fs.h"
  
 +#include <linux/decompress/generic.h>
 +
 +
  int __initdata rd_prompt = 1;/* 1 = prompt for RAM disk, 0 = don't prompt */
  
  static int __init prompt_ramdisk(char *str)
@@@ -40,23 -38,24 +41,25 @@@ static int __init crd_load(int in_fd, i
   * numbers could not be found.
   *
   * We currently check for the following magic numbers:
 - *    minix
 - *    ext2
 + *    minix
 + *    ext2
   *    romfs
   *    cramfs
 - *    gzip
+  *    squashfs
 + *    gzip
   */
 -static int __init 
 -identify_ramdisk_image(int fd, int start_block)
 +static int __init
 +identify_ramdisk_image(int fd, int start_block, decompress_fn *decompressor)
  {
        const int size = 512;
        struct minix_super_block *minixsb;
        struct ext2_super_block *ext2sb;
        struct romfs_super_block *romfsb;
        struct cramfs_super *cramfsb;
+       struct squashfs_super_block *squashfsb;
        int nblocks = -1;
        unsigned char *buf;
 +      const char *compress_name;
  
        buf = kmalloc(size, GFP_KERNEL);
        if (!buf)

diff --cc init/initramfs.c
Simple merge