]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit2273b9a4b7879b792f8e38cc72f0cc8641ae433e
tree690f1b48b070f5e268d51c54b63943dc3b807e50
parent69ff9331606329a3a82f71ce4d9f4593b69c4cfb
parentaf6e3d09329309cdd040f545f25b1ec1817a9347
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>