git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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...


Trivial merge
Pandora Kernel Repository