summaryrefslogtreecommitdiff
path: root/fs/nfs/nfs4state.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-10-11 02:57:16 (GMT)
committerDavid S. Miller <davem@davemloft.net>2012-10-11 02:57:16 (GMT)
commit959859d2fe88fb26e37985445817ef5234bf9a31 (patch)
tree36957f514bb0d4336863e7673f4251eacd54b20a /fs/nfs/nfs4state.c
parent68aaed54e7682aef261d5c2cf99e85a9dbf33a84 (diff)
parent922cd657c95fe3e4214d68a958e98288b7a55bba (diff)
downloadlinux-fsl-qoriq-959859d2fe88fb26e37985445817ef5234bf9a31.tar.xz
Merge branch 'uapi-for-3.7' of git://gitorious.org/linux-can/linux-can
Marc Kleine-Budde says: ==================== this pull request for net, i.e. the v3.7 release cycle, contains the patch by David Howells to move the UAPI related headers for the CAN subsystem. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs/nfs/nfs4state.c')
0 files changed, 0 insertions, 0 deletions