summaryrefslogtreecommitdiffstats
path: root/fs/nfsd/nfs2acl.c
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>2010-11-18 22:43:38 -0800
committerJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>2010-11-18 22:43:38 -0800
commit67cb40560940ba36de22d66f0d5d8efe235c8bb1 (patch)
tree1bc7f165e7ddaef5792fc13b4cc56b2c2b700725 /fs/nfsd/nfs2acl.c
parentbc7fc5e33e1a093e5f9e196595843bb096471586 (diff)
parent70697d540c0598ad023a391d4c895044db9a6624 (diff)
downloadlinux-67cb40560940ba36de22d66f0d5d8efe235c8bb1.tar.bz2
Merge branch 'xen/dev-evtchn' into upstream/evtchn
* xen/dev-evtchn: xen/evtchn: add missing static xen/evtchn: Fix name of Xen event-channel device xen/evtchn: don't do unbind_from_irqhandler under spinlock xen/evtchn: remove spurious barrier xen/evtchn: ports start enabled xen/evtchn: dynamically allocate port_user array xen/evtchn: track enabled state for each port
Diffstat (limited to 'fs/nfsd/nfs2acl.c')
0 files changed, 0 insertions, 0 deletions