Merge remote-tracking branch 'origin/master' into develop

5 files changed, 12 insertions, 12 deletions

diff --git a/quantum/led.c b/quantum/led.c
index 3e30b1a5ad..8f0eccf55d 100644
--- a/quantum/led.c
+++ b/quantum/led.c
@@ -134,4 +134,4 @@ __attribute__((weak)) void led_set(uint8_t usb_led) {
 
     led_set_kb(usb_led);
     led_update_kb((led_t)usb_led);
-}
\ No newline at end of file
+}
diff --git a/quantum/pointing_device.c b/quantum/pointing_device.c
index 24a487b9aa..9b7629f307 100644
--- a/quantum/pointing_device.c
+++ b/quantum/pointing_device.c
@@ -52,4 +52,4 @@ __attribute__((weak)) void pointing_device_task(void) {
 
 report_mouse_t pointing_device_get_report(void) { return mouseReport; }
 
-void pointing_device_set_report(report_mouse_t newMouseReport) { mouseReport = newMouseReport; }
\ No newline at end of file
+void pointing_device_set_report(report_mouse_t newMouseReport) { mouseReport = newMouseReport; }
diff --git a/quantum/serial_link/README.md b/quantum/serial_link/README.md
index e8490e290d..05871dbdf7 100644
--- a/quantum/serial_link/README.md
+++ b/quantum/serial_link/README.md
@@ -1 +1 @@
-# qmk_serial_link
\ No newline at end of file
+# qmk_serial_link
diff --git a/quantum/serial_link/tests/Makefile b/quantum/serial_link/tests/Makefile
index 1b072c6f1d..11dd355b22 100644
--- a/quantum/serial_link/tests/Makefile
+++ b/quantum/serial_link/tests/Makefile
@@ -1,17 +1,17 @@
 # The MIT License (MIT)
-# 
+#
 # Copyright (c) 2016 Fred Sundvik
-# 
+#
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be included in all
 # copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -21,7 +21,7 @@
 # SOFTWARE.
 
 CC = gcc
-CFLAGS	= 
+CFLAGS	=
 INCLUDES = -I. -I../../
 LDFLAGS = -L$(BUILDDIR)/cgreen/build-c/src -shared
 LDLIBS = -lcgreen
@@ -37,7 +37,7 @@ endif
 ifneq (, $(findstring CYGWIN, $(UNAME)))
 	EXT = .dll
 endif
-	
+
 SRC = $(wildcard *.c)
 TESTFILES = $(patsubst %.c, $(UNITTESTS)/%$(EXT), $(SRC))
 $(shell mkdir -p $(DEPDIR) >/dev/null)
@@ -54,8 +54,8 @@ $(UNITOBJ)/%.o: %.c $(DEPDIR)/%.d
 	@mkdir -p $(UNITOBJ)
 	$(CC) $(CFLAGS) $(DEPFLAGS) $(INCLUDES) -c $< -o $@
 	@mv -f $(DEPDIR)/$*.Td $(DEPDIR)/$*.d
-	
+
 $(DEPDIR)/%.d: ;
 .PRECIOUS: $(DEPDIR)/%.d
 
--include $(patsubst %,$(DEPDIR)/%.d,$(basename $(SRC)))
\ No newline at end of file
+-include $(patsubst %,$(DEPDIR)/%.d,$(basename $(SRC)))
diff --git a/quantum/serial_link/tests/testlist.mk b/quantum/serial_link/tests/testlist.mk
index a80e888849..c5edaf478f 100644
--- a/quantum/serial_link/tests/testlist.mk
+++ b/quantum/serial_link/tests/testlist.mk
@@ -3,4 +3,4 @@ TEST_LIST +=\
 	serial_link_frame_validator\
 	serial_link_frame_router\
 	serial_link_triple_buffered_object\
-	serial_link_transport
\ No newline at end of file
+	serial_link_transport