| commit | 94aca80897501f994c795cffc458ecd0404377c7 | [log] [tgz] |
|---|---|---|
| author | H. Peter Anvin <hpa@linux.intel.com> | Wed May 21 17:38:22 2014 -0700 |
| committer | H. Peter Anvin <hpa@linux.intel.com> | Wed May 21 17:38:22 2014 -0700 |
| tree | 312f96755c4e7ab4c50766aea35c9e7aa2ebe015 | |
| parent | 03c1b4e8e560455a2634a76998883a22f1a01207 [diff] | |
| parent | 368b69a5b010cb00fc9ea04d588cff69af1a1359 [diff] |
Merge remote-tracking branch 'origin/x86/urgent' into x86/vdso Resolved Conflicts: arch/x86/vdso/vdso32-setup.c Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>