From 59f85c246ae9af2fa239c1a2e709200c99de3617 Mon Sep 17 00:00:00 2001
From: harryxiyou <harryxiyou@gmail.com>
Date: Mon, 7 May 2012 17:20:27 -0700
Subject: [PATCH] --- yaml --- r: 304087 b: refs/heads/master c:
 a9e73211fb0fc875637793a8af770f3678b6c278 h: refs/heads/master i:   304085:
 c613a5948bd2402f78ac3afefb1c24ed0f00bbf3   304083:
 e7bb096711c8da77e3eeaaf8d772242ba8817028   304079:
 57d5d9eabc317c6ebc01169b2ca2ad83d56b6488 v: v3

---
 [refs]                                     | 2 +-
 trunk/Documentation/zh_CN/magic-number.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 39458ab334e2..6cadf3d704a0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c4e00daaa96d3a0786f1f4fe6456281c60ef9a16
+refs/heads/master: a9e73211fb0fc875637793a8af770f3678b6c278
diff --git a/trunk/Documentation/zh_CN/magic-number.txt b/trunk/Documentation/zh_CN/magic-number.txt
index f606ba8598cf..4263022f5002 100644
--- a/trunk/Documentation/zh_CN/magic-number.txt
+++ b/trunk/Documentation/zh_CN/magic-number.txt
@@ -160,7 +160,7 @@ QUEUE_MAGIC_USED      0xf7e1cc33  queue_entry       drivers/scsi/arm/queue.c
 HTB_CMAGIC            0xFEFAFEF1  htb_class         net/sched/sch_htb.c
 NMI_MAGIC             0x48414d4d455201 nmi_s        arch/mips/include/asm/sn/nmi.h
 
-请注意，在声音记忆管理中仍然有每一些被定义的驱动魔术值。查看include/sound/sndmagic.h来获取他们完整的列表信息。很多OSS声音驱动拥有自己从声卡PCI ID构建的魔术值-他们也没有被列在这里。
+请注意，在声音记忆管理中仍然有一些特殊的为每个驱动定义的魔术值。查看include/sound/sndmagic.h来获取他们完整的列表信息。很多OSS声音驱动拥有自己从声卡PCI ID构建的魔术值-他们也没有被列在这里。
 
 IrDA子系统也使用了大量的自己的魔术值，查看include/net/irda/irda.h来获取他们完整的信息。