Merge branch 'linus' into x86/setup-lzma
authorIngo Molnar <mingo@elte.hu>
Sat, 10 Jan 2009 11:04:41 +0000 (12:04 +0100)
committerIngo Molnar <mingo@elte.hu>
Sat, 10 Jan 2009 11:04:41 +0000 (12:04 +0100)
commitb17304245f0db0ac69b795c411407808f3f2796d
tree63ed3915d9295bd08f640bf25c322064ba787fad
parent889c92d21db40be0b7d22a59395060237895bb85
parent9a100a4464917b5ffff3a8ce1c2758088fd9bb32
Merge branch 'linus' into x86/setup-lzma

Conflicts:
init/do_mounts_rd.c
init/Kconfig
init/do_mounts_rd.c
init/initramfs.c