Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 15 Dec 2009 17:12:43 +0000 (09:12 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 15 Dec 2009 17:12:43 +0000 (09:12 -0800)
commitd180ec5d348e3a51836d723c182374483012c981
tree252bcf36f7f6e329d94092a3238a79d7f2e1e2e2
parent53365383c4667aba55385cd1858582c19a7a8a36
parent0b1b213fcf3a8486ada99a2bab84ab8c6f51b264
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
fs/xfs/xfs_log_recover.c