From: J. Bruce Fields <bfields@redhat.com>
Date: Tue, 9 Dec 2014 16:12:26 +0000 (-0500)
Subject: Merge tag 'nfs-for-3.19-1' into nfsd for-3.19 branch
X-Git-Tag: android-x86-4.4-r3~657^2~18
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2941b0e91ba68b1f77140e556307e00616a5bb46;p=android-x86%2Fkernel.git

Merge tag 'nfs-for-3.19-1' into nfsd for-3.19 branch

Mainly what I need is 860a0d9e511f "sunrpc: add some tracepoints in
svc_rqst handling functions", which subsequent server rpc patches from
jlayton depend on.  I'm merging this later tag on the assumption that's
more likely to be a tested and stable point.
---

2941b0e91ba68b1f77140e556307e00616a5bb46