From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 15 Dec 2009 17:12:43 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
X-Git-Tag: firefly_0821_release~9833^2~3654
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d180ec5d348e3a51836d723c182374483012c981;p=firefly-linux-kernel-4.4.55.git

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
---

d180ec5d348e3a51836d723c182374483012c981