projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3af968e 0e6e027)
Merge branch 'for-linus' of git://neil.brown.name/md
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 9 Jun 2009 15:41:22 +0000 (08:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 9 Jun 2009 15:41:22 +0000 (08:41 -0700)
commit4d11eff66889e65e9351111b1cc39f066f9f9729
treee96ed48c0f9ad90e3d8dd319874dc6b577958374tree | snapshot
parent3af968e066d593bc4dacc021715f3e95ddf0996fcommit | diff
parent0e6e0271a210817e202c8a4bfffbde3e3c0616d1commit | diff
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
John Crispins staging tree