Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 23 Aug 2011 18:41:44 +0000 (11:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 23 Aug 2011 18:41:44 +0000 (11:41 -0700)
commit35a177a08d14f238d89d7f03918d3e0482af3240
tree72a71fe4cec13e079e182633a62ea9219dbde656
parenta76ef86455fd8d199d482acc402675e4dcbe58fe
parentb6bede3b4cdfbd188557ab50fceec2e91d295edf
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: fix tracing builds inside the source tree
  xfs: remove subdirectories
  xfs: don't expect xfs headers to be in subdirectories