From: tmk <hasu@tmk-kbd.com>
Date: Thu, 11 Feb 2016 03:21:21 +0000 (+0900)
Subject: Merge commit '28203e909e83b1ac6becb45a3eadae23b190df32' into master-core-pull
X-Git-Url: https://git.gir.st/tmk_keyboard.git/commitdiff_plain/b47a88f4a5c3e054539f4113cdf13cf8d2c65545?hp=5b8e4ca2c4c8c46a67d2fdaa2eba925faca91739

Merge commit '28203e909e83b1ac6becb45a3eadae23b190df32' into master-core-pull
---

diff --git a/tmk_core/README.md b/tmk_core/README.md
index 6b6714a6..f460d0ed 100644
--- a/tmk_core/README.md
+++ b/tmk_core/README.md
@@ -5,6 +5,16 @@ This is a keyboard firmware library with some useful features for Atmel AVR and
 Source code is available here: <https://github.com/tmk/tmk_keyboard/tree/core>
 
 
+Updates
+-------
+#### 2016/02/10
+flabbergast's Chibios protocol was merged from <https://github.com/flabbergast/tmk_keyboard/tree/chibios>. See [protocol/chibios/README.md](protocol/chibios/README.md). Chibios protocol supports Cortex-M such as STM32 and Kinetis.
+
+#### 2015/04/22
+separated with TMK Keyboard Firmware Collection
+
+
+
 Features
 --------
 These features can be used in your keyboard.
@@ -27,12 +37,6 @@ These features can be used in your keyboard.
 
 
 
-Updates
--------
-2015/04/22  separated with TMK Keyboard Firmware Collection
-
-
-
 TMK Keyboard Firmware Collection
 --------------------------------
 Complete firmwares for various keyboards and protocol converters.