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

Browse source

* '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

...

This commit is contained in:

Linus Torvalds 2011-04-24 08:42:15 -07:00

parent 3ba4162115 6e0d9fd38b

commit 1f91f48b65

2 changed files with 47 additions and 8 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

26

fs/ubifs/recovery.c

View file

29

fs/ubifs/super.c

View file