Merge branch 'x86/urgent' into x86/pat
authorIngo Molnar <mingo@elte.hu>
Wed, 25 Feb 2009 15:40:10 +0000 (16:40 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 25 Feb 2009 15:40:10 +0000 (16:40 +0100)
1  2 
arch/x86/include/asm/io.h
arch/x86/mm/ioremap.c

Simple merge
Simple merge