From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 23 Aug 2011 18:41:44 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
X-Git-Tag: v3.1-rc4~54
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=35a177a08d14f238d89d7f03918d3e0482af3240

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

35a177a08d14f238d89d7f03918d3e0482af3240