Merge commit 'upstream/3.10'
authorBdale Garbee <bdale@gag.com>
Fri, 3 Apr 2009 23:48:47 +0000 (17:48 -0600)
committerBdale Garbee <bdale@gag.com>
Fri, 3 Apr 2009 23:48:47 +0000 (17:48 -0600)
commitf41ff1002722fef541f9544012f0bffa4f79d993
treeeeaa09c6873b21454e8754535b7be323be7dc264
parent08667d905dddb7b1249497e51bd44ed4e1f2e3b5
parent3384f0373c8758e5ddd08f489ad7110898dd5406
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