Merge branch 'delayed-logging-for-2.6.35' into for-linus
authorAlex Elder <aelder@sgi.com>
Mon, 24 May 2010 16:57:36 +0000 (11:57 -0500)
committerAlex Elder <aelder@sgi.com>
Mon, 24 May 2010 16:57:36 +0000 (11:57 -0500)
commit88e88374ee4958786397a57f684de6f1fc5e0242
tree750fe86ece5d65e597223eb07c5ce7cf5b3749a0
parent7e125f7b9cbfce4101191b8076d606c517a73066
parentccf7c23fc129e75ef60e6f59f60a485b7a056598
Merge branch 'delayed-logging-for-2.6.35' into for-linus
fs/xfs/linux-2.6/xfs_quotaops.c
fs/xfs/linux-2.6/xfs_super.c