tree f0d6e3d05d301d3aadb7e8bdd42083be98e29e0d
parent f27f0a045b79de5729d064497e21a70871f1d6fe
parent 1b895840ce93fd2d150a86c800a3085eaab4eb9e
author Linus Torvalds <torvalds@g5.osdl.org> 1144008685 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1144008685 -0700

Merge git://oss.sgi.com:8090/oss/git/xfs-2.6

* git://oss.sgi.com:8090/oss/git/xfs-2.6:
  [XFS] Provide XFS support for the splice syscall.
  [XFS] Reenable write barriers by default.
  [XFS] Make project quota enforcement return an error code consistent with
  [XFS] Implement the silent parameter to fill_super, previously ignored.
  [XFS] Cleanup comment to remove reference to obsoleted function