]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-client.git/commitdiff
projects / ceph-client.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 30285c6 d906f0e)
Merge branch 'x86/numa' into x86/urgent
authorIngo Molnar <mingo@elte.hu>
Mon, 10 Jan 2011 08:35:57 +0000 (09:35 +0100)
committerIngo Molnar <mingo@elte.hu>
Mon, 10 Jan 2011 08:36:07 +0000 (09:36 +0100)
Merge reason: Topic is ready for upstream.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
1  2 
arch/x86/mm/srat_64.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/mm/srat_64.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.