Merge tag 'v4.0-rc5' into x86/fpu, to prevent conflicts
authorIngo Molnar <mingo@kernel.org>
Mon, 23 Mar 2015 09:13:36 +0000 (10:13 +0100)
committerIngo Molnar <mingo@kernel.org>
Mon, 23 Mar 2015 09:13:36 +0000 (10:13 +0100)
Signed-off-by: Ingo Molnar <mingo@kernel.org>

Trivial merge