Merge commit 'v2.6.39-rc4' into next

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/input/touchscreen/intel-mid-touch.c b/drivers/input/touchscreen/intel-mid-touch.c
index c0307b22d86f..66c96bfc5522 100644
--- a/drivers/input/touchscreen/intel-mid-touch.c
+++ b/drivers/input/touchscreen/intel-mid-touch.c
@@ -542,7 +542,7 @@ static int __devinit mrstouch_adc_init(struct mrstouch_dev *tsdev)
          * ADC power on, start, enable PENDET and set loop delay
          * ADC loop delay is set to 4.5 ms approximately
          * Loop delay more than this results in jitter in adc readings
-         * Setting loop delay to 0 (continous loop) in MAXIM stops PENDET
+         * Setting loop delay to 0 (continuous loop) in MAXIM stops PENDET
          * interrupt generation sometimes.
          */