Index: kernel/generic/src/synch/waitq.c
===================================================================
--- kernel/generic/src/synch/waitq.c	(revision ace9358bf05a78b5ff9de605c08bec3f4338888f)
+++ kernel/generic/src/synch/waitq.c	(revision 83512f218dedeb9823a83908ea76dbed9da915bd)
@@ -407,5 +407,5 @@
  *
  * @param wq		Pointer to wait queue.
- * @param mode		If mode is WAKEUP_FIRST, then the longest waitingi
+ * @param mode		If mode is WAKEUP_FIRST, then the longest waiting
  * 			thread, if any, is woken up. If mode is WAKEUP_ALL, then
  *			all waiting threads, if any, are woken up. If there are
Index: kernel/generic/src/time/timeout.c
===================================================================
--- kernel/generic/src/time/timeout.c	(revision ace9358bf05a78b5ff9de605c08bec3f4338888f)
+++ kernel/generic/src/time/timeout.c	(revision 83512f218dedeb9823a83908ea76dbed9da915bd)
@@ -33,5 +33,5 @@
 /**
  * @file
- * @brief	Timeout management functions.
+ * @brief		Timeout management functions.
  */
 
@@ -62,5 +62,5 @@
  * Initialize all members except the lock.
  *
- * @param t Timeout to be initialized.
+ * @param t		Timeout to be initialized.
  *
  */
@@ -79,5 +79,5 @@
  * Initialize all members including the lock.
  *
- * @param t Timeout to be initialized.
+ * @param t		Timeout to be initialized.
  *
  */
@@ -95,12 +95,12 @@
  * time microseconds (or slightly more).
  *
- * @param t    Timeout structure.
- * @param time Number of usec in the future to execute
- *             the handler.
- * @param f    Timeout handler function.
- * @param arg  Timeout handler argument.
- *
- */
-void timeout_register(timeout_t *t, uint64_t time, timeout_handler_t f, void *arg)
+ * @param t		Timeout structure.
+ * @param time		Number of usec in the future to execute the handler.
+ * @param f		Timeout handler function.
+ * @param arg		Timeout handler argument.
+ *
+ */
+void
+timeout_register(timeout_t *t, uint64_t time, timeout_handler_t f, void *arg)
 {
 	timeout_t *hlp = NULL;
@@ -166,7 +166,7 @@
  * Remove timeout from timeout list.
  *
- * @param t Timeout to unregister.
- *
- * @return true on success, false on failure.
+ * @param t		Timeout to unregister.
+ *
+ * @return		True on success, false on failure.
  */
 bool timeout_unregister(timeout_t *t)