From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 24 Apr 2011 15:42:15 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.infradead.org/ubifs-2.6
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1f91f48b65a075c29c4adc57a895ff0e7306e2ee;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'for-linus' of git://git.infradead.org/ubifs-2.6

* 'for-linus' of git://git.infradead.org/ubifs-2.6:
  UBIFS: fix master node recovery
  UBIFS: fix false assertion warning in case of I/O failures
  UBIFS: fix false space checking failure
---

1f91f48b65a075c29c4adc57a895ff0e7306e2ee