projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3ba4162 6e0d9fd)
Merge branch 'for-linus' of git://git.infradead.org/ubifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 24 Apr 2011 15:42:15 +0000 (08:42 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 24 Apr 2011 15:42:15 +0000 (08:42 -0700)
* '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


Trivial merge