Merge branch 'linus' into irq/threaded

Conflicts:
	include/linux/irq.h
	kernel/irq/handle.c

1 files changed, 0 insertions, 1 deletions

diff --git a/fs/xfs/xfs_qmops.c b/fs/xfs/xfs_qmops.c
index 27f80581520a..e101790ea8e7 100644
--- a/fs/xfs/xfs_qmops.c
+++ b/fs/xfs/xfs_qmops.c
@@ -126,7 +126,6 @@ static struct xfs_qmops xfs_qmcore_stub = {
         .xfs_dqvopchownresv     = (xfs_dqvopchownresv_t) fs_noerr,
         .xfs_dqstatvfs          = (xfs_dqstatvfs_t) fs_noval,
         .xfs_dqsync             = (xfs_dqsync_t) fs_noerr,
-        .xfs_quotactl           = (xfs_quotactl_t) fs_nosys,
 };
 
 int