| commit | ca836a25435ef1b9914840ed0a310c9b6ac261d1 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Oct 28 05:46:02 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Oct 28 05:46:02 2011 -0700 |
| tree | 13c94f7e2fff14eb526608c2884b5faa3dab1f90 | |
| parent | d630ba565f3d806d64df4415d4a8457b4ab23db6 [diff] | |
| parent | 664ef2123f4abc05857bf9b2dcccb800fa6fce26 [diff] |
Merge branch 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/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..)