Merge commit 'v2.6.34-rc6' into sched/core

This commit is contained in:
Ingo Molnar
2010-05-07 11:27:54 +02:00
547 changed files with 9333 additions and 3960 deletions

View File

@@ -457,7 +457,8 @@ static char * __init unpack_to_rootfs(char *buf, unsigned len)
compress_name);
message = msg_buf;
}
}
} else
error("junk in compressed archive");
if (state != Reset)
error("junk in compressed archive");
this_header = saved_offset + my_inptr;