Merge branch 'x86-mm' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into x86/mm

Browse source

...

This commit is contained in:

Ingo Molnar 2011-03-05 07:32:45 +01:00

parent d04c579f97 078a198906

commit ca764aaf02

5 changed files with 79 additions and 101 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

arch/x86/include/asm/page_types.h

View file

8

arch/x86/kernel/setup.c

View file

54

arch/x86/mm/init_64.c

View file

100

arch/x86/mm/numa_64.c

View file

20

arch/x86/mm/numa_emulation.c

View file