From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 16 Feb 2011 08:42:50 +0000 (+0100)
Subject: Merge branch 'x86/bootmem' into x86/mm
X-Git-Tag: v2.6.39-rc1~499^2~55
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=02ac81a812fe0575a8475a93bdc22fb291ebad91;p=karo-tx-linux.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 <mingo@elte.hu>
---

02ac81a812fe0575a8475a93bdc22fb291ebad91