projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9a6d44b d2137d5)
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)
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>

Trivial merge
John Crispins staging tree