projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit693a30b8f19a964087a3762d09fb2e1cbad6b0d4
treee7241cd6bb6f2614cf05075c65e949b329e35538tree | snapshot (tar.gz zip)
parent4bf9636c39ac70da091d5a2e28d3448eaa7f115ccommit | diff
parentb485342bd79af363c77ef1a421c4a0aef2de9812commit | diff
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