Merge branch 'linus' into x86/pat
authorIngo Molnar <mingo@elte.hu>
Mon, 19 May 2008 07:23:07 +0000 (09:23 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 19 May 2008 07:23:07 +0000 (09:23 +0200)
commita8ac1ae3a2a8ceb5bc1d334a502d42f59b91379c
treefa3c8e81ffa64798e85425cf139fdd6ba3fd7963
parentb4ef290d7c3abd1bf8cefcf8def359537fda7f31
parentb8291ad07a7f3b5b990900f0001198ac23ba893e
Merge branch 'linus' into x86/pat
arch/x86/mm/pat.c