diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-02 18:47:10 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-02 18:47:10 -0700 |
commit | c6b96d195a0fd132d6e8c783216d1d3f686e5ba8 (patch) | |
tree | cf4594f2ae0407e4a501a20ba05c5629161b47ee /Documentation/power/swsusp-dmcrypt.txt | |
parent | 79ff1ad2eec1c106962241f6346958b9641e34f3 (diff) | |
parent | 9bbbca3a0ee09293108b67835c6bdf6196d7bcb3 (diff) |
Merge branch 'for-2.6.26' of git://neil.brown.name/md
* 'for-2.6.26' of git://neil.brown.name/md:
Fix error paths if md_probe fails.
Don't acknowlege that stripe-expand is complete until it really is.
Ensure interrupted recovery completed properly (v1 metadata plus bitmap)
Diffstat (limited to 'Documentation/power/swsusp-dmcrypt.txt')
0 files changed, 0 insertions, 0 deletions