diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-03 03:47:10 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-03 03:47:10 +0200 |
| commit | c6b96d195a0fd132d6e8c783216d1d3f686e5ba8 (patch) | |
| tree | cf4594f2ae0407e4a501a20ba05c5629161b47ee /drivers/net/gianfar.h | |
| parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/... (diff) | |
| parent | Fix error paths if md_probe fails. (diff) | |
| download | linux-c6b96d195a0fd132d6e8c783216d1d3f686e5ba8.tar.xz linux-c6b96d195a0fd132d6e8c783216d1d3f686e5ba8.zip | |
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 'drivers/net/gianfar.h')
0 files changed, 0 insertions, 0 deletions