tree d9abcf526baee0100672851e0a8894c19e762a39
parent 68f30fbee19cc67849b9fa8e153ede70758afe81
parent 90a4c0f51e8e44111a926be6f4c87af3938a79c3
author H. Peter Anvin <hpa@linux.intel.com> 1327006610 -0800
committer H. Peter Anvin <hpa@linux.intel.com> 1327006610 -0800

Merge remote-tracking branch 'linus/master' into x86/urgent