Merge branch 'controller_bus' into corso2013

Conflicts: controller/controller/controller_load.h

Merge branch 'controller_bus' into corso2013
Conflicts: controller/controller/controller_load.h
d068fe3e · Jeroen Vreeken · 91581f32 · cf2b006f · d068fe3e
Commit d068fe3e authored Dec 11, 2013 by Jeroen Vreeken
--- a/controller/controller/controller_load.h
+++ b/controller/controller/controller_load.h
@@ -27,4 +27,5 @@ int controller_load_shell_add(void);

 int controller_load(char *filename);

+
 #endif /* _INCLUDE_CONTROLLER_LOAD_H_ */