From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 4 Jan 2015 19:46:43 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
X-Git-Tag: v3.19-rc3~3
X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=693a30b8f19a964087a3762d09fb2e1cbad6b0d4;p=cascardo%2Flinux.git

Merge branch 'for-linus' of git://git./linux/kernel/git/rw/uml

Pull UML fixes from Richard Weinberger:
 "Two fixes for UML regressions. Nothing exciting"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
  x86, um: actually mark system call tables readonly
  um: Skip futex_atomic_cmpxchg_inatomic() test
---

693a30b8f19a964087a3762d09fb2e1cbad6b0d4