tree e7241cd6bb6f2614cf05075c65e949b329e35538
parent 4bf9636c39ac70da091d5a2e28d3448eaa7f115c
parent b485342bd79af363c77ef1a421c4a0aef2de9812
author Linus Torvalds <torvalds@linux-foundation.org> 1420400803 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1420400803 -0800

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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