| commit | 1f91f48b65a075c29c4adc57a895ff0e7306e2ee | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Apr 24 08:42:15 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Apr 24 08:42:15 2011 -0700 |
| tree | 5966d172b8f484011ebb2b4c00988b81060afb82 | |
| parent | 3ba41621156681afcdbcd624e3191cbc65eb94f4 [diff] | |
| parent | 6e0d9fd38b750d678bf9fd07db23582f52fafa55 [diff] |
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