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)
commit2e31add2a7e2a15d07f592c21ba35870fa9a1d1f
tree814e2c70fb5528f108114c0da6e5a1e219e6a0e1
parentd639bab8da86d330493487e8c0fea8ca31f53427
parent17581ad812a9abb0182260374ef2e52d4a808a64
Merge branch 'x86/urgent' into x86/pat
arch/x86/include/asm/io.h
arch/x86/mm/ioremap.c