From 9574b2ca428658acdc872afdf2cee29d9613ebac Mon Sep 17 00:00:00 2001
From: Allen Martin <amartin@nvidia.com>
Date: Fri, 14 Dec 2012 11:05:12 -0800
Subject: [PATCH] --- yaml --- r: 347286 b: refs/heads/master c:
 6a79131318dd6f71ec46e0af1daa581e695fd5ab h: refs/heads/master v: v3

---
 [refs]                                                          | 2 +-
 .../devicetree/bindings/spi/nvidia,tegra20-sflash.txt           | 2 +-
 .../devicetree/bindings/spi/nvidia,tegra20-slink.txt            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 41e37f87fbb6..3615e1781a5e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 850a5b670af6293fcb1852af57567d19150ff638
+refs/heads/master: 6a79131318dd6f71ec46e0af1daa581e695fd5ab
diff --git a/trunk/Documentation/devicetree/bindings/spi/nvidia,tegra20-sflash.txt b/trunk/Documentation/devicetree/bindings/spi/nvidia,tegra20-sflash.txt
index 8cf24f6f0a99..7b53da5cb75b 100644
--- a/trunk/Documentation/devicetree/bindings/spi/nvidia,tegra20-sflash.txt
+++ b/trunk/Documentation/devicetree/bindings/spi/nvidia,tegra20-sflash.txt
@@ -13,7 +13,7 @@ Recommended properties:
 
 Example:
 
-spi@7000d600 {
+spi@7000c380 {
 	compatible = "nvidia,tegra20-sflash";
 	reg = <0x7000c380 0x80>;
 	interrupts = <0 39 0x04>;
diff --git a/trunk/Documentation/devicetree/bindings/spi/nvidia,tegra20-slink.txt b/trunk/Documentation/devicetree/bindings/spi/nvidia,tegra20-slink.txt
index f5b1ad1a1ec3..eefe15e3d95e 100644
--- a/trunk/Documentation/devicetree/bindings/spi/nvidia,tegra20-slink.txt
+++ b/trunk/Documentation/devicetree/bindings/spi/nvidia,tegra20-slink.txt
@@ -13,7 +13,7 @@ Recommended properties:
 
 Example:
 
-slink@7000d600 {
+spi@7000d600 {
 	compatible = "nvidia,tegra20-slink";
 	reg = <0x7000d600 0x200>;
 	interrupts = <0 82 0x04>;