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

Conflicts:
	tools/testing/selftests/x86/Makefile
	tools/testing/selftests/x86/run_x86_tests.sh
This commit is contained in:
Ingo Molnar 2015-05-17 07:57:31 +02:00
commit 75d95d8488
427 changed files with 4375 additions and 4274 deletions