]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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()

1  2 
arch/um/Kconfig.common patch | diff1 | diff2 | blob | history

diff --cc arch/um/Kconfig.common
Simple merge
Linux kernel for KaRo TX COM modules