From 65fbbcc3a0482524f2d404463d208a74a49251e6 Mon Sep 17 00:00:00 2001
From: "Justin P. Mattock" <justinmattock@gmail.com>
Date: Mon, 25 Jun 2012 07:28:25 -0700
Subject: [PATCH] --- yaml --- r: 317535 b: refs/heads/master c:
 7756d3e8b0acff580aab1f60c30e066e20a9900e h: refs/heads/master i:   317533:
 02782b83662c0b70409a0f6030bf720b5800f3a5   317531:
 4c591b57a5bb90d623c7b785dfac033d1f9a9fc3   317527:
 cfee3f2d1c13b2fda5f63302a7e39395a4762eae   317519:
 eac6a9d1f54fad2db839c5778a5f869e1a170ab2   317503:
 c428926c455eb641672842f5727c64a81745ecca v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/staging/sm7xxfb/sm7xxfb.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 96b887e1ca56..8d0ba3aa2229 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e2361720b9da9ec830d407da058ca1827e62b12
+refs/heads/master: 7756d3e8b0acff580aab1f60c30e066e20a9900e
diff --git a/trunk/drivers/staging/sm7xxfb/sm7xxfb.c b/trunk/drivers/staging/sm7xxfb/sm7xxfb.c
index 21dab346253a..32111a011f66 100644
--- a/trunk/drivers/staging/sm7xxfb/sm7xxfb.c
+++ b/trunk/drivers/staging/sm7xxfb/sm7xxfb.c
@@ -351,7 +351,7 @@ static int smtc_setcolreg(unsigned regno, unsigned red, unsigned green,
 	case FB_VISUAL_DIRECTCOLOR:
 	case FB_VISUAL_TRUECOLOR:
 		/*
-		 * 16/32 bit true-colour, use pseuo-palette for 16 base color
+		 * 16/32 bit true-colour, use pseudo-palette for 16 base color
 		 */
 		if (regno < 16) {
 			if (sfb->fb.var.bits_per_pixel == 16) {
@@ -996,7 +996,7 @@ static int smtcfb_pci_suspend(struct device *device)
 
 	sfb = pci_get_drvdata(pdev);
 
-	/* set the hw in sleep mode use externel clock and self memory refresh
+	/* set the hw in sleep mode use external clock and self memory refresh
 	 * so that we can turn off internal PLLs later on
 	 */
 	smtc_seqw(0x20, (smtc_seqr(0x20) | 0xc0));