Merge branch 'master' into for-linus

fs/xfs/linux-2.6/xfs_aops.c

fs/xfs/linux-2.6/xfs_buf.c

fs/xfs/linux-2.6/xfs_buf.h

fs/xfs/linux-2.6/xfs_file.c

fs/xfs/linux-2.6/xfs_ioctl.c

fs/xfs/linux-2.6/xfs_ioctl32.c

fs/xfs/linux-2.6/xfs_iops.c

fs/xfs/linux-2.6/xfs_super.c

fs/xfs/linux-2.6/xfs_sync.c

fs/xfs/linux-2.6/xfs_trace.c

fs/xfs/linux-2.6/xfs_trace.h

fs/xfs/quota/xfs_dquot.c

fs/xfs/quota/xfs_dquot.h

fs/xfs/quota/xfs_dquot_item.c

fs/xfs/quota/xfs_qm.c

fs/xfs/quota/xfs_qm.h

fs/xfs/quota/xfs_qm_stats.c

fs/xfs/quota/xfs_qm_syscalls.c

fs/xfs/quota/xfs_quota_priv.h

fs/xfs/quota/xfs_trans_dquot.c