summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-04-24 08:42:15 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-04-24 08:42:15 -0700
commit1f91f48b65a075c29c4adc57a895ff0e7306e2ee (patch)
tree5966d172b8f484011ebb2b4c00988b81060afb82 /include
parent3ba41621156681afcdbcd624e3191cbc65eb94f4 (diff)
parent6e0d9fd38b750d678bf9fd07db23582f52fafa55 (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
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions