From 72a64711a980be742f6cd1af9274e2180d449184 Mon Sep 17 00:00:00 2001
From: Kristoffer Glembo <kristoffer@gaisler.com>
Date: Wed, 2 Dec 2009 04:30:20 +0000
Subject: [PATCH] --- yaml --- r: 170408 b: refs/heads/master c:
 3560f788fe207de25c96ea547c56fc8a750e37a5 h: refs/heads/master v: v3

---
 [refs]                        |  2 +-
 trunk/arch/sparc/kernel/cpu.c | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f4232ac2741d..79c9f05852f4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c57ec52f2647e53709c3ce8d86b28876c2f32de0
+refs/heads/master: 3560f788fe207de25c96ea547c56fc8a750e37a5
diff --git a/trunk/arch/sparc/kernel/cpu.c b/trunk/arch/sparc/kernel/cpu.c
index 1446df90ef85..e447938d39cf 100644
--- a/trunk/arch/sparc/kernel/cpu.c
+++ b/trunk/arch/sparc/kernel/cpu.c
@@ -184,6 +184,17 @@ static const struct manufacturer_info __initconst manufacturer_info[] = {
 		FPU(3, "Fujitsu or Weitek on-chip FPU"),
 		FPU(-1, NULL)
 	}
+},{
+	0xF,		/* Aeroflex Gaisler */
+	.cpu_info = {
+		CPU(3, "LEON"),
+		CPU(-1, NULL)
+	},
+	.fpu_info = {
+		FPU(2, "GRFPU"),
+		FPU(3, "GRFPU-Lite"),
+		FPU(-1, NULL)
+	}
 },{
 	0x17,
 	.cpu_info = {