From 8c47814d8d6925fde83aba463b50aadf742f7c22 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Fri, 16 Dec 2016 21:33:17 +0200
Subject: [PATCH] Add support for Samsung ARTIK boards (520, 710, 1020) and
 ARTIK SDK // Resolve #353

---
 HISTORY.rst | 6 ++++++
 README.rst  | 1 +
 docs        | 2 +-
 setup.py    | 2 +-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index 4be9cca4..47e20789 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -22,6 +22,12 @@ PlatformIO 3.0
   + Updated ESP32 Core for Arduino
 
 
+* Development platform `Linux ARM <https://github.com/platformio/platform-linux_arm>`__
+
+  + Added support for Samsung ARTIK boards (520, 710, 1020) and ARTIK SDK
+    (`issue #353 <https://github.com/platformio/platformio-core/issues/353>`_)
+
+
 3.2.1 (2016-12-07)
 ~~~~~~~~~~~~~~~~~~
 
diff --git a/README.rst b/README.rst
index 66e6a5a8..be79d927 100644
--- a/README.rst
+++ b/README.rst
@@ -174,6 +174,7 @@ It has support for the most popular embedded platforms:
 Frameworks:
 
 * `Arduino <http://platformio.org/frameworks/arduino>`_
+* `ARTIK SDK <http://platformio.org/frameworks/artik-sdk>`_
 * `CMSIS <http://platformio.org/frameworks/cmsis>`_
 * `Energia <http://platformio.org/frameworks/energia>`_
 * `ESP-IDF <http://platformio.org/frameworks/espidf>`_
diff --git a/docs b/docs
index 343ed9c1..f7bf9adf 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 343ed9c1d2ebf6321027cebe45284b33b35809af
+Subproject commit f7bf9adf3d44fd60a76126ccbcac00ce1aaaa31d
diff --git a/setup.py b/setup.py
index b54a4d19..4b71930f 100644
--- a/setup.py
+++ b/setup.py
@@ -69,6 +69,6 @@ setup(
         "iot", "ide", "build", "compile", "library manager",
         "embedded", "ci", "continuous integration", "arduino", "mbed",
         "esp8266", "framework", "ide", "ide integration", "library.json",
-        "make", "cmake", "makefile", "mk", "pic32", "fpga"
+        "make", "cmake", "makefile", "mk", "pic32", "fpga", "artik"
     ]
 )