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)
commitfd40261354802b0f05f6f67121235aa002e87069
tree935f23fa1528f6fe5a078383c9343907ea27fbb3
parentf3ad116588151b3371ae4e092290e4f48e62b8bb
parente83f1eb6bfc4004c19a99ee5f5aa65bd3fbecec3
Merge branch 'master' of git://oss.sgi.com/xfs/xfs into for-linus
fs/xfs/linux-2.6/xfs_super.c
fs/xfs/xfs_trans.c