From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 8 Sep 2014 22:51:01 +0000 (-0700)
Subject: Merge branch 'for_linus_urgent' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~176^2~3262
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8c68face5548cdecb770d75ad44a74aec9352d10;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for_linus_urgent' of git://git./linux/kernel/git/tytso/ext4

Pull ext4 bugfix from Ted Ts'o.

[ Hmm.  It's possible we should make kfree() aware of error pointers,
  and use IS_ERR_OR_NULL rather than a NULL check.  But in the meantime
  this is obviously the right fix.  - Linus ]

* 'for_linus_urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: avoid trying to kfree an ERR_PTR pointer
---

8c68face5548cdecb770d75ad44a74aec9352d10