]> 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)
commitfc0ebb5a814f5b2b31a203b426d0cc86b657803e
tree5966d172b8f484011ebb2b4c00988b81060afb82
parent6efea5d4af17702b43b459f16830ec6d5f0225a9
parent58c1289b416fccbb60fe8461e4c5e1ca17575fcb
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