tree 749cb64a2829b174e6d5df76da756285e7554002
parent 13b2eda64d14d0a0c15c092664c7351ea58ea851
parent 13093cb0e59053bf97910de3a24f07cdff71c62c
author Ingo Molnar <mingo@elte.hu> 1235626283 +0100
committer Ingo Molnar <mingo@elte.hu> 1235626283 +0100

Merge branches 'x86/urgent' and 'x86/pat' into x86/core

Conflicts:
	arch/x86/include/asm/pat.h