From: Ingo Molnar Date: Wed, 16 Feb 2011 08:42:50 +0000 (+0100) Subject: Merge branch 'x86/bootmem' into x86/mm X-Git-Tag: firefly_0821_release~7613^2~2227^2~55 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=02ac81a812fe0575a8475a93bdc22fb291ebad91;p=firefly-linux-kernel-4.4.55.git 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 --- 02ac81a812fe0575a8475a93bdc22fb291ebad91