commit | fb1cb7b27bba3446bed377c173dbdd2d288e3992 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Nov 12 08:11:03 2010 -0800 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Nov 12 08:11:03 2010 -0800 |
tree | 914c2211472ab86696319e729290a1ad786621be | |
parent | fe7e96f66b2622d8492ee9dd7fc08b811086caca [diff] | |
parent | ece413f59f257682de4a2e2e42af33b016af53f3 [diff] |
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs * 'for-linus' of git://oss.sgi.com/xfs/xfs: xfs: remove incorrect assert in xfs_vm_writepage xfs: use hlist_add_fake xfs: fix a few compiler warnings with CONFIG_XFS_QUOTA=n xfs: tell lockdep about parent iolock usage in filestreams xfs: move delayed write buffer trace xfs: fix per-ag reference counting in inode reclaim tree walking xfs: xfs_ioctl: fix information leak to userland xfs: remove experimental tag from the delaylog option