Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 31 May 2011 17:07:22 +0000 (02:07 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 31 May 2011 17:07:22 +0000 (02:07 +0900)
commitaf0d6a0a3a30946f7df69c764791f1b0643f7cd6
treeccf9310a7d8ab00d7677d06d5f2bde48368a43ac
parent07ef3c3b44896bc0432a901fe6ae0d0deaca47ce
parent4f3c125c7420c85eaff627145557e392a871922d
Merge branch 'x86-urgent-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Fix mwait_play_dead() faulting on mwait-incapable cpus
  x86 idle: Fix mwait deprecation warning message

Evil merge to remove extra quote noticed by Joe Perches
arch/x86/kernel/process.c