]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
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)
1  2 
fs/xfs/linux-2.6/xfs_quotaops.c
fs/xfs/linux-2.6/xfs_super.c

Simple merge
Simple merge