| commit | 35a177a08d14f238d89d7f03918d3e0482af3240 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Aug 23 11:41:44 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Aug 23 11:41:44 2011 -0700 |
| tree | 72a71fe4cec13e079e182633a62ea9219dbde656 | |
| parent | a76ef86455fd8d199d482acc402675e4dcbe58fe [diff] | |
| parent | b6bede3b4cdfbd188557ab50fceec2e91d295edf [diff] |
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