Merge branch 'x86/bootmem' into x86/mm
authorIngo Molnar <mingo@elte.hu>
Wed, 16 Feb 2011 08:42:50 +0000 (09:42 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 16 Feb 2011 08:43:54 +0000 (09:43 +0100)
commit02ac81a812fe0575a8475a93bdc22fb291ebad91
tree690f1b48b070f5e268d51c54b63943dc3b807e50
parent9a6d44b9adb777ca9549e88cd55bd8f2673c52a2
parentd2137d5af4259f50c19addb8246a186c9ffac325
Merge branch 'x86/bootmem' into x86/mm

Merge reason: the topic is ready - consolidate it into the more generic x86/mm tree
              and prevent conflicts.

Signed-off-by: Ingo Molnar <mingo@elte.hu>