From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 15 Jul 2011 18:03:49 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke... 
X-Git-Tag: firefly_0821_release~3680^2~5051
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=af8a927c8bdea82cf220e0b720d64daaf073a969;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-linus' of git://git./linux/kernel/git/ryusuke/nilfs2

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
  nilfs2: remove resize from unsupported features list
---

af8a927c8bdea82cf220e0b720d64daaf073a969