git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ac49b9a e6ab9a2)
Merge remote-tracking branch 'origin/x86/espfix' into x86/vdso
authorH. Peter Anvin <hpa@linux.intel.com>
Thu, 22 May 2014 00:36:33 +0000 (17:36 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Thu, 22 May 2014 00:36:33 +0000 (17:36 -0700)
Merge x86/espfix into x86/vdso, due to changes in the vdso setup code
that otherwise cause conflicts.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

Trivial merge
Pandora Kernel Repository