tree ccf9310a7d8ab00d7677d06d5f2bde48368a43ac
parent 07ef3c3b44896bc0432a901fe6ae0d0deaca47ce
parent 4f3c125c7420c85eaff627145557e392a871922d
author Linus Torvalds <torvalds@linux-foundation.org> 1306861642 +0900
committer Linus Torvalds <torvalds@linux-foundation.org> 1306861642 +0900

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/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