Merge branch 'linus' into x86/pat
authorIngo Molnar <mingo@elte.hu>
Mon, 16 Jun 2008 09:20:28 +0000 (11:20 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 16 Jun 2008 09:20:28 +0000 (11:20 +0200)
commitfaeca31d068090285b77c39574d2bda14b079c50
tree789841a7f0d336b24a74f2191542a2eb8177c8fa
parent499f8f84b8324ba27d756e03f373fa16eeed9ccc
parent066519068ad2fbe98c7f45552b1f592903a9c8c8
Merge branch 'linus' into x86/pat
arch/x86/mm/ioremap.c
arch/x86/mm/pat.c