diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-23 14:41:44 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-23 14:41:44 -0400 |
| commit | 35a177a08d14f238d89d7f03918d3e0482af3240 (patch) | |
| tree | 72a71fe4cec13e079e182633a62ea9219dbde656 /drivers/net/slip.c | |
| 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
Diffstat (limited to 'drivers/net/slip.c')
0 files changed, 0 insertions, 0 deletions