]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'nfsd/nfsd-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 11 Oct 2012 23:29:30 +0000 (10:29 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 11 Oct 2012 23:29:30 +0000 (10:29 +1100)
commit7768d921ab59e521854387197fcdeeeaf815a3ca
tree6d3862ea63b7055cc7a205ab5217c25ed24adefb
parentbe4dbeb4aa9cef4abd15ab8ca43c916b6ad3ad75
parenta9ca4043d074509b9d15003fbcb068d3cdae85a4
Merge remote-tracking branch 'nfsd/nfsd-next'
fs/lockd/svc.c
fs/nfs/callback.c