git.stricted.de - GitHub/moto-9609/android_kernel_motorola

author	Ingo Molnar <mingo@elte.hu>
	Wed, 16 Feb 2011 08:42:50 +0000 (09:42 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Wed, 16 Feb 2011 08:43:54 +0000 (09:43 +0100)
commit	02ac81a812fe0575a8475a93bdc22fb291ebad91
tree	690f1b48b070f5e268d51c54b63943dc3b807e50	tree \| snapshot (tar.gz zip)
parent	9a6d44b9adb777ca9549e88cd55bd8f2673c52a2	commit \| diff
parent	d2137d5af4259f50c19addb8246a186c9ffac325	commit \| diff

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>