tree ee63644d2dc59899e42ec0802c201140e3a92e5e
parent 63a16f90167850010864a9e8ebb71d216983090f
parent 388667bed591b2359713bb17d5de0cf56e961447
author Linus Torvalds <torvalds@linux-foundation.org> 1217616967 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1217616967 -0700

Merge branch 'for-linus' of git://neil.brown.name/md

* 'for-linus' of git://neil.brown.name/md:
  md: raid10: wake up frozen array
  md: do not count blocked devices as spares
  md: do not progress the resync process if the stripe was blocked
  md: delay notification of 'active_idle' to the recovery thread
  md: fix merge error
  md: move async_tx_issue_pending_all outside spin_lock_irq