]> git.ipfire.org Git - people/ms/linux.git/commit
projects / people / ms / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1251704 ce45860)
Merge branch 'for-linus-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 May 2017 17:20:02 +0000 (10:20 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 May 2017 17:20:02 +0000 (10:20 -0700)
commitec059019b7e6ae3926a8e1dec02a62d64dd8c060
treeab60e0f2d21154dda05f58af310a66c94179d70atree | snapshot
parent1251704a631b62591ad1d1b6ead252e9e597d5f5commit | diff
parentce4586063f1af780b1c6b7e344907e6f9c1ba59acommit | diff
Merge branch 'for-linus-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml

Pull UML fixes from Richard Weinberger:
 "No new stuff, just fixes"

* 'for-linus-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
  um: Add missing NR_CPUS include
  um: Fix to call read_initrd after init_bootmem
  um: Include kbuild.h instead of duplicating its macros
  um: Fix PTRACE_POKEUSER on x86_64
  um: Set number of CPUs
  um: Fix _print_addr()
arch/um/Kconfig.common diff1 | diff2 | blob | history
Michael's Linux tree.