---

yaml --- r: 117753 b: refs/heads/master c: 3059ef9 h: refs/heads/master i: 117751: 83a71cc v: v3
git-mirror · Oct 23, 2008 · 82eb4ac · 82eb4ac
1 parent 75df25e
commit 82eb4ac
Show file tree

Hide file tree

Showing 112 changed files with 7,213 additions and 5,955 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea541686d8454efac4f2b5c0767affb12d4b6a52
+refs/heads/master: 3059ef99a167da6d5d77701fda5b905d985e31af
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
@@ -378,9 +378,8 @@ T:	git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu.git
 S:	Supported
 
 AMD MICROCODE UPDATE SUPPORT
-P:      Andreas Herrmann
-M:      andeas.herrmann3@amd.com
-L:      amd64-microcode@amd64.org
+P:      Peter Oruba
+M:      peter.oruba@amd.com
 S:      Supported
 
 AMS (Apple Motion Sensor) DRIVER

diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
@@ -540,15 +540,16 @@ config ARCH_OMAP
 	help
 	  Support for TI's OMAP platform (OMAP1 and OMAP2).
 
-config ARCH_MSM
-	bool "Qualcomm MSM"
+config ARCH_MSM7X00A
+	bool "Qualcomm MSM7X00A"
 	select GENERIC_TIME
 	select GENERIC_CLOCKEVENTS
 	help
-	  Support for Qualcomm MSM7K based systems.  This runs on the ARM11
-	  apps processor of the MSM7K and depends on a shared memory
+	  Support for Qualcomm MSM7X00A based systems.  This runs on the ARM11
+	  apps processor of the MSM7X00A and depends on a shared memory
 	  interface to the ARM9 modem processor which runs the baseband stack
 	  and controls some vital subsystems (clock and power control, etc).
+	  <http://www.cdmatech.com/products/msm7200_chipset_solution.jsp>
 
 endchoice
 

diff --git a/trunk/arch/arm/Makefile b/trunk/arch/arm/Makefile
@@ -141,7 +141,7 @@ endif
  machine-$(CONFIG_ARCH_MX3)	   := mx3
  machine-$(CONFIG_ARCH_ORION5X)	   := orion5x
     plat-$(CONFIG_PLAT_ORION)	   := orion
- machine-$(CONFIG_ARCH_MSM)	   := msm
+ machine-$(CONFIG_ARCH_MSM7X00A)   := msm
  machine-$(CONFIG_ARCH_LOKI)       := loki
  machine-$(CONFIG_ARCH_MV78XX0)    := mv78xx0