diff --git a/[refs] b/[refs] index 4b3396c64896..a8b622949fc3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 44363f14d9e7c9786ddbe7742d0f002b4ad685e1 +refs/heads/master: ee0fc097ef47a4a6ff6b4800f2391030131b7828 diff --git a/trunk/drivers/watchdog/shwdt.c b/trunk/drivers/watchdog/shwdt.c index cecbedd473a4..61dde863bd40 100644 --- a/trunk/drivers/watchdog/shwdt.c +++ b/trunk/drivers/watchdog/shwdt.c @@ -52,7 +52,7 @@ * overflow periods respectively. * * Also, since we can't really expect userspace to be responsive enough - * before the overflow happens, we maintain two seperate timers .. One in + * before the overflow happens, we maintain two separate timers .. One in * the kernel for clearing out WOVF every 2ms or so (again, this depends on * HZ == 1000), and another for monitoring userspace writes to the WDT device. *