Merge branch 'linus' into x86/setup-lzma

Conflicts:
	init/do_mounts_rd.c
This commit is contained in:
Ingo Molnar 2009-01-10 12:04:41 +01:00
commit b17304245f
3749 changed files with 674243 additions and 86435 deletions

View file

@ -317,6 +317,7 @@ static int __init do_name(void)
if (wfd >= 0) {
sys_fchown(wfd, uid, gid);
sys_fchmod(wfd, mode);
sys_ftruncate(wfd, body_len);
vcollected = kstrdup(collected, GFP_KERNEL);
state = CopyFile;
}