projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4bf9636 b485342)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 4 Jan 2015 19:46:43 +0000 (11:46 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 4 Jan 2015 19:46:43 +0000 (11:46 -0800)
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


Trivial merge
John Crispins staging tree