projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 861b710 a9cfcd6)
Merge branch 'for_linus_urgent' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 8 Sep 2014 22:51:01 +0000 (15:51 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 8 Sep 2014 22:51:01 +0000 (15:51 -0700)
commit8c68face5548cdecb770d75ad44a74aec9352d10
tree9d6b4f8032f7ee8d19817ad9d332844794ba506ctree | snapshot
parent861b7102b58ea55e171e503c2163efd60a4cc052commit | diff
parenta9cfcd63e8d206ce4235c355d857c4fbdf0f4587commit | diff
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
John Crispins staging tree