projects / linux-flexiantxendom0-3.2.10.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8394edf b0d634d)
Merge tag 'md-3.4-fixes' of git://neil.brown.name/md
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 May 2012 23:19:59 +0000 (16:19 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 May 2012 23:19:59 +0000 (16:19 -0700)
Pull one more md bugfix from NeilBrown:
 "Fix bug in recent fix to RAID10.

  Without this patch, recovery will crash"

* tag 'md-3.4-fixes' of git://neil.brown.name/md:
  md/raid10: fix transcription error in calc_sectors conversion.


Trivial merge
Port of xen3.3 xenlinux code to Ubuntu packaged SUSE kernel (3.2.10)