Merge branch 'linus' into x86/urgent
authorIngo Molnar <mingo@kernel.org>
Wed, 2 Apr 2014 07:48:56 +0000 (09:48 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 2 Apr 2014 07:48:56 +0000 (09:48 +0200)
Pick up Linus's latest, to fix a bug.

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

Trivial merge