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)
Conflicts:
init/do_mounts_rd.c


Trivial merge