projects / firefly-linux-kernel-4.4.55.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: e89e896)
Merge branch 'devel' into next
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Tue, 15 Jul 2008 22:34:16 +0000 (18:34 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Tue, 15 Jul 2008 22:34:16 +0000 (18:34 -0400)
Conflicts:

fs/nfs/file.c

Fix up the conflict with Jon Corbet's bkl-removal tree


No differences found
Unnamed repository; edit this file 'description' to name the repository.