From: Bdale Garbee <bdale@gag.com>
Date: Fri, 3 Apr 2009 23:48:47 +0000 (-0600)
Subject: Merge commit 'upstream/3.10'
X-Git-Tag: debian/3.10-1~6
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=f41ff1002722fef541f9544012f0bffa4f79d993;p=debian%2Felilo

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
---

f41ff1002722fef541f9544012f0bffa4f79d993