]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'for-linus' of git://neil.brown.name/md
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 25 Feb 2009 17:34:27 +0000 (09:34 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 25 Feb 2009 17:34:27 +0000 (09:34 -0800)
* 'for-linus' of git://neil.brown.name/md:
  md: avoid races when stopping resync.
  md/raid10:  Don't call bitmap_cond_end_sync when we are doing recovery.
  md/raid10:  Don't skip more than 1 bitmap-chunk at a time during recovery.


Trivial merge