From: Linus Torvalds 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: firefly_0821_release~176^2~2565 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=693a30b8f19a964087a3762d09fb2e1cbad6b0d4;p=firefly-linux-kernel-4.4.55.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