]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commita8faf1fd751ba90f26d2e565573be91a8b80a840
tree5966d172b8f484011ebb2b4c00988b81060afb82
parenta668af9f08025d8b46bcd8cce823c657526a2e6f
parent950a954256473827d0dabc000b283349f9c9125c
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