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-04-04 16:39:20 +02:00

parent 78fca1b958 711b8c87a5

commit 9402efaa96

10 changed files with 70 additions and 203 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

30

arch/x86/Kconfig

View file

13

arch/x86/include/asm/cpufeature.h

View file

23

arch/x86/include/asm/mmzone_64.h

View file

27

arch/x86/include/asm/percpu.h

View file

2

arch/x86/kernel/apic/apic.c

View file

7

arch/x86/kernel/cpu/mcheck/therm_throt.c

View file

4

arch/x86/kernel/process.c

View file

4

arch/x86/kernel/smpboot.c

View file

131

arch/x86/mm/numa_64.c

View file

32

drivers/acpi/processor_throttling.c

View file