s@linux-foundation.org> 1320099689 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1320099689 -0700

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

* 'for-linus' of git://neil.brown.name/md:
  md/raid10:  Fix bug when activating a hot-spare.
è­Šçš/x