Merge branches 'for-4.11/upstream-fixes', 'for-4.12/accutouch', 'for-4.12/cp2112...

[mirror_ubuntu-artful-kernel.git] / include / linux / edac.h

diff --git a/include/linux/edac.h b/include/linux/edac.h
index 07c52c0af62d1aa9525c4ecd66c5f59f0e75619d..5b6adf964248dd478dd6d266ccc59468d26951ce 100644 (file)
--- a/include/linux/edac.h
+++ b/include/linux/edac.h
@@ -190,8 +190,8 @@ static inline char *mc_event_error_type(const unsigned int err_type)
  *                     part of the memory details to the memory controller.
  * @MEM_RMBS:          Rambus DRAM, used on a few Pentium III/IV controllers.
  * @MEM_DDR2:          DDR2 RAM, as described at JEDEC JESD79-2F.
- *                     Those memories are labed as "PC2-" instead of "PC" to
- *                     differenciate from DDR.
+ *                     Those memories are labeled as "PC2-" instead of "PC" to
+ *                     differentiate from DDR.
  * @MEM_FB_DDR2:       Fully-Buffered DDR2, as described at JEDEC Std No. 205
  *                     and JESD206.
  *                     Those memories are accessed per DIMM slot, and not by