diff options
| author | Grant Likely <grant.likely@linaro.org> | 2014-11-24 15:50:07 +0100 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2014-11-24 15:50:07 +0100 |
| commit | 66e6a5a1fcd2f3e05f4d499b539a1f77ceb52d1d (patch) | |
| tree | d72f980f64b88ea4e976215a503fcb038e02f981 /drivers/of/dynamic.c | |
| parent | of: Properly set the OF_POPULATED_BUS flag on root node (diff) | |
| parent | Linux 3.18-rc6 (diff) | |
| download | linux-66e6a5a1fcd2f3e05f4d499b539a1f77ceb52d1d.tar.xz linux-66e6a5a1fcd2f3e05f4d499b539a1f77ceb52d1d.zip | |
Merge tag 'v3.18-rc6' into devicetree/next
v3.18-rc6 contains an important DT bug fix, c1a2086e2d, "of/selftest:
Fix off-by-one error in removal path" which affects testing of the
overlay patch series. Merge it into the devicetree/next staging branch
so that the overlay patches are applied on top of a known working tree.
Linux 3.18-rc6
Conflicts:
drivers/of/address.c
Diffstat (limited to 'drivers/of/dynamic.c')
| -rw-r--r-- | drivers/of/dynamic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/of/dynamic.c b/drivers/of/dynamic.c index da2509d639c8..d43f3059963b 100644 --- a/drivers/of/dynamic.c +++ b/drivers/of/dynamic.c @@ -234,7 +234,7 @@ void of_node_release(struct kobject *kobj) * @allocflags: Allocation flags (typically pass GFP_KERNEL) * * Copy a property by dynamically allocating the memory of both the - * property stucture and the property name & contents. The property's + * property structure and the property name & contents. The property's * flags have the OF_DYNAMIC bit set so that we can differentiate between * dynamically allocated properties and not. * Returns the newly allocated property or NULL on out of memory error. |