From 81f5a270be03d2d3c7577f4b7134b50a8b32e469 Mon Sep 17 00:00:00 2001
From: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
Date: Sun, 26 Jul 2009 12:34:40 -0300
Subject: [PATCH] --- yaml --- r: 159218 b: refs/heads/master c:
 987b8816661332978efd0f85bedf9866fe2e3232 h: refs/heads/master v: v3

---
 [refs]                                        | 2 +-
 trunk/Documentation/networking/00-INDEX       | 2 ++
 trunk/Documentation/networking/ieee802154.txt | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 598227f6480c..665448a4f1bb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f0166e5e3cdab66d5a31f796ce18e21fd3ce99dc
+refs/heads/master: 987b8816661332978efd0f85bedf9866fe2e3232
diff --git a/trunk/Documentation/networking/00-INDEX b/trunk/Documentation/networking/00-INDEX
index 1634c6dcecae..50189bf07d53 100644
--- a/trunk/Documentation/networking/00-INDEX
+++ b/trunk/Documentation/networking/00-INDEX
@@ -60,6 +60,8 @@ framerelay.txt
 	- info on using Frame Relay/Data Link Connection Identifier (DLCI).
 generic_netlink.txt
 	- info on Generic Netlink
+ieee802154.txt
+	- Linux IEEE 802.15.4 implementation, API and drivers
 ip-sysctl.txt
 	- /proc/sys/net/ipv4/* variables
 ip_dynaddr.txt
diff --git a/trunk/Documentation/networking/ieee802154.txt b/trunk/Documentation/networking/ieee802154.txt
index a0280ad2edc9..1d4ed66b1b1c 100644
--- a/trunk/Documentation/networking/ieee802154.txt
+++ b/trunk/Documentation/networking/ieee802154.txt
@@ -69,7 +69,7 @@ We provide an example of simple HardMAC driver at drivers/ieee802154/fakehard.c
 SoftMAC
 =======
 
-We are going to provide intermediate layer impelementing IEEE 802.15.4 MAC
+We are going to provide intermediate layer implementing IEEE 802.15.4 MAC
 in software. This is currently WIP.
 
 See header include/net/ieee802154/mac802154.h and several drivers in