projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d630ba5 664ef21)
Merge branch 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 28 Oct 2011 12:46:02 +0000 (05:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 28 Oct 2011 12:46:02 +0000 (05:46 -0700)
commitca836a25435ef1b9914840ed0a310c9b6ac261d1
tree13c94f7e2fff14eb526608c2884b5faa3dab1f90tree | snapshot (tar.gz zip)
parentd630ba565f3d806d64df4415d4a8457b4ab23db6commit | diff
parent664ef2123f4abc05857bf9b2dcccb800fa6fce26commit | diff
Merge branch 'x86-vdso-for-linus' of git://git./linux/kernel/git/tip/tip

* 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86-64, doc: Remove int 0xcc from entry_64.S documentation
  x86, vsyscall: Add missing <asm/fixmap.h> to arch/x86/mm/fault.c

Fix up trivial conflicts in arch/x86/mm/fault.c (asm/fixmap.h vs
asm/vsyscall.h: both work, which to use? Whatever..)
arch/x86/mm/fault.c diff1 | diff2 | blob | history