projects / platform / kernel / kernel-mfld-blackbay.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f3ad116 e83f1eb)
Merge branch 'master' of git://oss.sgi.com/xfs/xfs into for-linus
authorFelix Blyakher <felixb@sgi.com>
Sat, 13 Jun 2009 02:28:59 +0000 (21:28 -0500)
committerFelix Blyakher <felixb@sgi.com>
Sat, 13 Jun 2009 02:28:59 +0000 (21:28 -0500)
1  2 
fs/xfs/linux-2.6/xfs_super.c patch | diff1 | diff2 | blob | history
fs/xfs/xfs_trans.c patch | diff1 | diff2 | blob | history

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