projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d59bf96 077e989)
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Wed, 21 Jun 2006 00:46:21 +0000 (20:46 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Wed, 21 Jun 2006 00:46:21 +0000 (20:46 -0400)
Conflicts:

include/linux/nfs_fs.h

Fixed up conflict with kernel header updates.

1  2 
include/linux/fs.h patch | diff1 | diff2 | blob | history
include/linux/lockd/lockd.h patch | diff1 | diff2 | blob | history
include/linux/nfs4.h patch | diff1 | diff2 | blob | history

diff --cc include/linux/fs.h
Simple merge
diff --cc include/linux/lockd/lockd.h
Simple merge
diff --cc include/linux/nfs4.h
Simple merge