tree 252bcf36f7f6e329d94092a3238a79d7f2e1e2e2
parent 53365383c4667aba55385cd1858582c19a7a8a36
parent 0b1b213fcf3a8486ada99a2bab84ab8c6f51b264
author Linus Torvalds <torvalds@linux-foundation.org> 1260897163 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1260897163 -0800

Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: event tracing support
  xfs: change the xfs_iext_insert / xfs_iext_remove
  xfs: cleanup bmap extent state macros