Merge commit 'upstream/3.10'

Conflicts:
	ChangeLog
	Make.defaults
	alloc.c
	elilo.c
	ia32/bzimage.c
	ia32/gzip.c
	ia32/plain_loader.c
	ia32/sysdeps.h
	ia32/system.c
	ia64/gzip.c
	ia64/plain_loader.c
	inflate.c
	initrd.c
	x86_64/bzimage.c
	x86_64/gzip.c
	x86_64/plain_loader.c
	x86_64/sysdeps.h
	x86_64/system.c