projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7ed89ae 4c393a6)
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 2 Dec 2011 18:38:20 +0000 (10:38 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 2 Dec 2011 18:38:20 +0000 (10:38 -0800)
* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: fix attr2 vs large data fork assert
  xfs: force buffer writeback before blocking on the ilock in inode reclaim
  xfs: validate acl count


Trivial merge