From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 16 Jun 2009 19:23:52 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy... 
X-Git-Tag: firefly_0821_release~13896
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=cd5232bd6be2d215a800f3d88c287ca791debfbe;hp=-c;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-linus' of git://git./linux/kernel/git/shaggy/jfs-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6:
  jfs: fix regression preventing coalescing of extents
---

cd5232bd6be2d215a800f3d88c287ca791debfbe