tree 9b6cf3667a3ea90e0cec0ea7119688ba76c55a71
parent 99dd5497e5be4fe4194cad181d45fd6569a930db
parent 4bde23f8751f388867766b0a62ed1ef8b7e01561
author Ingo Molnar <mingo@kernel.org> 1333090039 +0200
committer Ingo Molnar <mingo@kernel.org> 1333090206 +0200

Merge branch 'linus' into x86/urgent

Merge reason: Needed for include file dependencies.

Signed-off-by: Ingo Molnar <mingo@elte.hu>