]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a43e531 758c757)
Merge branch topic/uek-4.1/upstream-cherry-picks of git://ca-git.us.oracle.com/linux...
authorChuck Anderson <chuck.anderson@oracle.com>
Sat, 11 Jun 2016 00:41:54 +0000 (17:41 -0700)
committerChuck Anderson <chuck.anderson@oracle.com>
Sat, 11 Jun 2016 00:41:54 +0000 (17:41 -0700)
1  2 
include/linux/sched.h patch | diff1 | diff2 | blob | history
kernel/sysctl.c patch | diff1 | diff2 | blob | history

diff --cc include/linux/sched.h
Simple merge
diff --cc kernel/sysctl.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.