From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 2 Oct 2006 15:27:09 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy... 
X-Git-Tag: firefly_0821_release~32747
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=44f549217cd26daf7063984ae4ee6e46beca9c41;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: White space cleanup
  [PATCH] JFS: return correct error when i-node allocation failed
  JFS: Remove shadow variable from fs/jfs/jfs_txnmgr.c:xtLog()
---

44f549217cd26daf7063984ae4ee6e46beca9c41