From: Sage Weil <sage@inktank.com>
Date: Sat, 28 Sep 2013 04:10:50 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.71~61
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=76321f8fc8ab5287e1a12473df8337cfd7711f4c;p=ceph.git

Merge remote-tracking branch 'gh/next'

Conflicts:
	src/common/crc32c_intel_fast.c
---

76321f8fc8ab5287e1a12473df8337cfd7711f4c
diff --cc src/common/crc32c_intel_fast.c
index 0532dd261cf0,49305088affe..42338a7bcd41
--- a/src/common/crc32c_intel_fast.c
+++ b/src/common/crc32c_intel_fast.c
@@@ -1,6 -1,5 +1,5 @@@
 -#include <inttypes.h>
  #include "acconfig.h"
 +#include "include/int_types.h"
- 
  #include "common/crc32c_intel_baseline.h"
  
  extern unsigned int crc32_iscsi_00(unsigned char const *buffer, int len, unsigned int crc);