Merge branch 'linus' into x86/pat2
authorIngo Molnar <mingo@elte.hu>
Fri, 10 Oct 2008 17:30:08 +0000 (19:30 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 10 Oct 2008 17:30:08 +0000 (19:30 +0200)
commit3dd392a407d15250a501fa109cc1f93fee95ef85
treec1faca3fa8bd0f7c8790b3e0887229b4a5a90e8b
parentb27a43c1e90582facad44de67d02bc9e9f900289
parentd403a6484f0341bf0624d17ece46f24f741b6a92
Merge branch 'linus' into x86/pat2

Conflicts:
arch/x86/mm/init_64.c
arch/x86/mm/init_32.c
arch/x86/mm/init_64.c
arch/x86/mm/ioremap.c
arch/x86/mm/pageattr.c
include/asm-x86/cacheflush.h
include/asm-x86/page.h
include/asm-x86/pgtable.h