Merge branch 'x86/urgent' into x86/asm, to refresh the tree

Browse source

Signed-off-by: Ingo Molnar <mingo@kernel.org>

...

This commit is contained in:

Ingo Molnar 2016-04-29 11:55:04 +02:00

parent b2eafe890d 1bdb897039

commit ffc5fce9a9

4 changed files with 11 additions and 9 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

3

arch/x86/kernel/apic/vector.c

View file

6

arch/x86/kernel/head_32.S

View file

5

arch/x86/mm/setup_nx.c

View file

6

arch/x86/xen/spinlock.c

View file