---

yaml
---
r: 49073
b: refs/heads/master
c: be7d2f7
h: refs/heads/master
i:
  49071: 145c9d5
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b3c3714cb4767d00f507cc6854d3339d82c5b9d
+refs/heads/master: be7d2f775c788a1891f0f600537f130178448b20

trunk/Documentation/driver-model/platform.txt

@@ -66,7 +66,7 @@ runtime memory footprint:
 
 Device Enumeration
 ~~~~~~~~~~~~~~~~~~
-As a rule, platform specific (and often board-specific) setup code wil
+As a rule, platform specific (and often board-specific) setup code will
 register platform devices:
 
 	int platform_device_register(struct platform_device *pdev);
@@ -106,7 +106,7 @@ It's built from two components:
     * platform_device.id ... the device instance number, or else "-1"
       to indicate there's only one.
 
-These are catenated, so name/id "serial"/0 indicates bus_id "serial.0", and
+These are concatenated, so name/id "serial"/0 indicates bus_id "serial.0", and
 "serial/3" indicates bus_id "serial.3"; both would use the platform_driver
 named "serial".  While "my_rtc"/-1 would be bus_id "my_rtc" (no instance id)
 and use the platform_driver called "my_rtc".