projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a76ef86 b6bede3)
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)
* '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


Trivial merge
Domain: System / Kernel;