[sheepdog] [sheepdog/sheepdog] fbf83f: Remove warning erasure_code/ec_multibinary.asm:255...

[Hitoshi Mitake]

  Branch: refs/heads/master
  Home:   https://github.com/sheepdog/sheepdog
  Commit: fbf83fc4181c53a15cf9473a14988296452def37
      https://github.com/sheepdog/sheepdog/commit/fbf83fc4181c53a15cf9473a14988296452def37
  Author: hongzhou zhang <hongzhou.h.zhang at intel.com>
  Date:   2015-08-31 (Mon, 31 Aug 2015)

  Changed paths:
    M lib/isa-l/erasure_code/ec_multibinary.asm

  Log Message:
  -----------
  Remove warning erasure_code/ec_multibinary.asm:255: warning: redefining multi-line macro `slversion'

Signed-off-by: hongzhou zhang <hongzhou.h.zhang at intel.com>


  Commit: c90b87cbda4123cb63930b77a10d53666491ec46
      https://github.com/sheepdog/sheepdog/commit/c90b87cbda4123cb63930b77a10d53666491ec46
  Author: Hitoshi Mitake <mitake.hitoshi at lab.ntt.co.jp>
  Date:   2015-08-31 (Mon, 31 Aug 2015)

  Changed paths:
    M lib/isa-l/erasure_code/ec_multibinary.asm

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/zhanghongzhou/sheepdog into zhanghongzhou-master


  Commit: 79515ef2da76b1c7a483dbad6c8bd01a5fc4a8ef
      https://github.com/sheepdog/sheepdog/commit/79515ef2da76b1c7a483dbad6c8bd01a5fc4a8ef
  Author: Hitoshi Mitake <mitake.hitoshi at lab.ntt.co.jp>
  Date:   2015-08-31 (Mon, 31 Aug 2015)

  Changed paths:
    M lib/isa-l/erasure_code/ec_multibinary.asm

  Log Message:
  -----------
  Merge branch 'zhanghongzhou-master'


Compare: https://github.com/sheepdog/sheepdog/compare/ccddb3ecb344...79515ef2da76