Index: src/testsuite/switchbench/switch.c
===================================================================
--- src/testsuite/switchbench/switch.c	(revision 1416)
+++ src/testsuite/switchbench/switch.c	(working copy)
@@ -38,8 +38,9 @@
 
 static inline void add_histogram(long addval)
 {
-       long inabs = rt_timer_tsc2ns(addval >= 0 ? addval : -addval) / 1000;  /* usec steps */
-       histogram[inabs < HISTOGRAM_CELLS ? inabs : HISTOGRAM_CELLS - 1]++;
+	/* usec steps */
+	long inabs = rt_timer_tsc2ns(addval >= 0 ? addval : -addval) / 1000;
+	histogram[inabs < HISTOGRAM_CELLS ? inabs : HISTOGRAM_CELLS - 1]++;
 }
 
 void dump_histogram(void)
@@ -134,10 +135,10 @@
        printf("RTH|%12s|%12s|%12s|%12s\n",
                       "lat min", "lat avg", "lat max", "lost");
 
-       printf("RTD|%12Ld|%12Ld|%12Ld|%12lld\n",
-                      rt_timer_tsc2ns(minjitter),
-                      rt_timer_tsc2ns(avgjitter),
-                      rt_timer_tsc2ns(maxjitter), lost);
+       printf("RTD|%12.3f|%12.3f|%12.3f|%12lld\n",
+                      rt_timer_tsc2ns(minjitter) / 1000,
+                      rt_timer_tsc2ns(avgjitter) / 1000,
+                      rt_timer_tsc2ns(maxjitter) / 1000, lost);
 
        if (do_histogram)
                dump_histogram();
Index: CREDITS
===================================================================
--- CREDITS	(revision 1416)
+++ CREDITS	(working copy)
@@ -43,7 +43,7 @@
 D: the map.
 
 N: Jim Cromie
-E: jcromie@domain.hid
+E: jim.cromie@domain.hid
 D: Comprehensive statistics collection for the testsuite.
 D: Validation test script. Various script fixes and sanitization.
 
Index: ksrc/arch/i386/Kconfig
===================================================================
--- ksrc/arch/i386/Kconfig	(revision 1416)
+++ ksrc/arch/i386/Kconfig	(working copy)
@@ -67,13 +67,13 @@
         and hence may not be altered.
 
         For this reason, Xenomai contains code to detect chipsets using
-        SMIs and optionnaly activate some workarounds to stop SMIs.
+        SMIs and optionally activate some workarounds to stop SMIs.
         
-        Enabling this option will cause Xenomai not to try and detect whether 
+        Enabling this option prevents Xenomai from detecting whether 
         your hardware use SMIs. This option is mostly useful if you know
         that your system does not use SMIs and really want to size Xenomai 
         modules down. The detection code has no run-time space overhead,
-        only disk-space overhead.
+        and a tiny memory footprint (<200 bytes on x86)
 
 config XENO_HW_SMI_DETECT
         bool
@@ -98,7 +98,7 @@
         and hence may not be altered.
 
         For this reason, Xenomai contains code to detect chipsets using
-        SMIs and optionnaly activate some workarounds to stop SMIs.
+        SMIs and optionally activate some workarounds to stop SMIs.
         Enabling this option cause those workarounds to be activated.
 
 if XENO_HW_SMI_WORKAROUND