projects / firefly-linux-kernel-4.4.55.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 03c1b4e 368b69a)
Merge remote-tracking branch 'origin/x86/urgent' into x86/vdso
authorH. Peter Anvin <hpa@linux.intel.com>
Thu, 22 May 2014 00:38:22 +0000 (17:38 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Thu, 22 May 2014 00:38:22 +0000 (17:38 -0700)
Resolved Conflicts:
arch/x86/vdso/vdso32-setup.c

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

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.