projects / platform / kernel / kernel-mfld-blackbay.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ad84563 f936972)
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)
1  2 
fs/xfs/linux-2.6/xfs_quotaops.c patch | diff1 | diff2 | blob | history

diff --cc fs/xfs/linux-2.6/xfs_quotaops.c
Simple merge
Domain: System / Uncategorized;