diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-31 13:07:22 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-31 13:07:22 -0400 |
| commit | af0d6a0a3a30946f7df69c764791f1b0643f7cd6 (patch) | |
| tree | ccf9310a7d8ab00d7677d06d5f2bde48368a43ac /arch/ia64/include/asm/io.h | |
| parent | 07ef3c3b44896bc0432a901fe6ae0d0deaca47ce (diff) | |
| parent | 4f3c125c7420c85eaff627145557e392a871922d (diff) | |
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
Diffstat (limited to 'arch/ia64/include/asm/io.h')
0 files changed, 0 insertions, 0 deletions