---

yaml --- r: 304378 b: refs/heads/master c: ad220db h: refs/heads/master v: v3
git-mirror · Apr 18, 2012 · 514c517 · 514c517
1 parent b3a41ff
commit 514c517
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 251640a74b086cb5b602870cdbaf72e6d3f1e714
+refs/heads/master: ad220db422c778a30f83061e9e2458b5f0ee6704
diff --git a/trunk/drivers/staging/android/alarm-dev.c b/trunk/drivers/staging/android/alarm-dev.c
@@ -54,7 +54,7 @@ module_param_named(debug_mask, debug_mask, int, S_IRUGO | S_IWUSR | S_IWGRP);
 	ANDROID_ALARM_RTC_WAKEUP_MASK | \
 	ANDROID_ALARM_ELAPSED_REALTIME_WAKEUP_MASK)
 
-/* support old usespace code */
+/* support old userspace code */
 #define ANDROID_ALARM_SET_OLD               _IOW('a', 2, time_t) /* set alarm */
 #define ANDROID_ALARM_SET_AND_WAIT_OLD      _IOW('a', 3, time_t)
 

diff --git a/trunk/drivers/staging/android/alarm.c b/trunk/drivers/staging/android/alarm.c
@@ -57,7 +57,7 @@ module_param_named(debug_mask, debug_mask, int, S_IRUGO | S_IWUSR | S_IWGRP);
 	ANDROID_ALARM_RTC_WAKEUP_MASK | \
 	ANDROID_ALARM_ELAPSED_REALTIME_WAKEUP_MASK)
 
-/* support old usespace code */
+/* support old userspace code */
 #define ANDROID_ALARM_SET_OLD               _IOW('a', 2, time_t) /* set alarm */
 #define ANDROID_ALARM_SET_AND_WAIT_OLD      _IOW('a', 3, time_t)
 
@@ -543,7 +543,7 @@ static int __init alarm_late_init(void)
 
 	/* this needs to run after the rtc is read at boot */
 	spin_lock_irqsave(&alarm_slock, flags);
-	/* We read the current rtc and system time so we can later calulate
+	/* We read the current rtc and system time so we can later calculate
 	 * elasped realtime to be (boot_systemtime + rtc - boot_rtc) ==
 	 * (rtc - (boot_rtc - boot_systemtime))
 	 */

diff --git a/trunk/drivers/staging/android/android_alarm.h b/trunk/drivers/staging/android/android_alarm.h
@@ -41,7 +41,7 @@ enum android_alarm_type {
 /*
  * The alarm interface is similar to the hrtimer interface but adds support
  * for wakeup from suspend. It also adds an elapsed realtime clock that can
- * be used for periodic timers that need to keep runing while the system is
+ * be used for periodic timers that need to keep running while the system is
  * suspended and not be disrupted when the wall time is set.
  */
 

diff --git a/trunk/drivers/staging/android/binder.h b/trunk/drivers/staging/android/binder.h
@@ -63,7 +63,7 @@ struct flat_binder_object {
 
 /*
  * On 64-bit platforms where user code may run in 32-bits the driver must
- * translate the buffer (and local binder) addresses apropriately.
+ * translate the buffer (and local binder) addresses appropriately.
  */
 
 struct binder_write_read {