projects / platform / kernel / linux-starfive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eb68d03 c470abd)
Merge tag 'v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
authorMike Marshall <hubcap@omnibond.com>
Sat, 25 Feb 2017 16:12:48 +0000 (11:12 -0500)
committerMike Marshall <hubcap@omnibond.com>
Sat, 25 Feb 2017 16:12:48 +0000 (11:12 -0500)
Linux 4.10

1  2 
fs/orangefs/devorangefs-req.c patch | diff1 | diff2 | blob | history
fs/orangefs/inode.c patch | diff1 | diff2 | blob | history
fs/orangefs/orangefs-debugfs.c patch | diff1 | diff2 | blob | history

diff --cc fs/orangefs/devorangefs-req.c
Simple merge
diff --cc fs/orangefs/inode.c
Simple merge
diff --cc fs/orangefs/orangefs-debugfs.c
Simple merge
Domain: System / Kernel;