projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 54b50af abe9a6d)
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)
commit8aa0a410af8011d557877e558f9ff17c082c6840
treee347920bcaba78f6af0fecc626c1842f85aeeb83tree | snapshot
parent54b50af089552bae368502e35dead67e81129b8dcommit | diff
parentabe9a6d57b4544ac208401f9c0a4262814db2be4commit | 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
John Crispins staging tree