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)
commitb8764fe6d0ba654c8705ebbb8c2c8ddd776d8928
tree3e28a08a044547d5429f011bcce24a3c82c89fec
parentb8c89c6a0d56d47ae7f22755a133540b32fa81cf
parent683b6c6f82a60fabf47012581c2cfbf1b037ab95
Merge branch 'linus' into x86/urgent

Pick up Linus's latest, to fix a bug.

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