Merge branch 'master' into for-linus
authorAlex Elder <aelder@sgi.com>
Fri, 4 Jun 2010 18:22:30 +0000 (13:22 -0500)
committerAlex Elder <aelder@sgi.com>
Fri, 4 Jun 2010 18:22:30 +0000 (13:22 -0500)
commit1bf7dbfde8fe7ddaa8e2e1b4e0fc41a9fc6aa7a5
treefdb99e686fa40e79cc53f80dfed58e9b548ed4eb
parentad8456361fa19068cf49b50a4f98e41b73c08e76
parentf9369729496a0f4c607a4cc1ea4dfeddbbfc505a
Merge branch 'master' into for-linus
fs/xfs/linux-2.6/xfs_quotaops.c