Merge branch 'x86/asm' into x86/apic, to resolve conflicts

Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar 2015-05-17 07:58:08 +02:00
commit cffc32975d
435 changed files with 4507 additions and 4443 deletions

Some files were not shown because too many files have changed in this diff Show more