]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6c35a58 246f5fb)
Merge commit 'nfs-for-3.3-4' into nfs-for-next
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Sat, 3 Mar 2012 20:04:15 +0000 (15:04 -0500)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Sat, 3 Mar 2012 20:05:56 +0000 (15:05 -0500)
commitfb11c14527d04c087e981721757a503b3ce4cac9
treee347920bcaba78f6af0fecc626c1842f85aeeb83tree | snapshot
parent6c35a588b35b1b1a3dcec14137a7628f9edba481commit | diff
parent246f5fb849f5a7a46b0bb70dee11ddab4c087f47commit | diff
Merge commit 'nfs-for-3.3-4' into nfs-for-next

Conflicts:
fs/nfs/nfs4proc.c

Back-merge of the upstream kernel in order to fix a conflict with the
slotid type conversion and implementation id patches...
fs/nfs/nfs4proc.c diff1 | diff2 | blob | history
fs/nfs/nfs4state.c diff1 | diff2 | blob | history
fs/nfs/nfs4xdr.c diff1 | diff2 | blob | history
include/linux/nfs_xdr.h diff1 | diff2 | blob | history
Linux Kernel Source Tree.