From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 28 Oct 2011 12:46:02 +0000 (-0700)
Subject: Merge branch 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=ca836a25435ef1b9914840ed0a310c9b6ac261d1;p=~shefty%2Frdma-dev.git

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..)
---

ca836a25435ef1b9914840ed0a310c9b6ac261d1