diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-09 19:41:22 +0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-09 19:41:22 +0400 |
commit | 4d11eff66889e65e9351111b1cc39f066f9f9729 (patch) | |
tree | e96ed48c0f9ad90e3d8dd319874dc6b577958374 /drivers/net/82596.c | |
parent | 3af968e066d593bc4dacc021715f3e95ddf0996f (diff) | |
parent | 0e6e0271a210817e202c8a4bfffbde3e3c0616d1 (diff) | |
download | linux-4d11eff66889e65e9351111b1cc39f066f9f9729.tar.xz |
Merge branch 'for-linus' of git://neil.brown.name/md
* 'for-linus' of git://neil.brown.name/md:
md/raid5: fix bug in reshape code when chunk_size decreases.
md/raid5 - avoid deadlocks in get_active_stripe during reshape
md/raid5: use conf->raid_disks in preference to mddev->raid_disk
Diffstat (limited to 'drivers/net/82596.c')
0 files changed, 0 insertions, 0 deletions