diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-04 11:40:58 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-04 11:40:58 -0700 |
commit | 80cc38b16389849a6e06441ace4530f6b2497c3c (patch) | |
tree | 1dabc02b0a1faa6b640de20e38aa31bb5d0c443f /drivers/of | |
parent | 3366dd9fa887ebbda4872e9554f853eaeda764be (diff) | |
parent | 83a35e360433b58791bc9c4e288cace466d62e3a (diff) | |
download | linux-stable-80cc38b16389849a6e06441ace4530f6b2497c3c.tar.gz linux-stable-80cc38b16389849a6e06441ace4530f6b2497c3c.tar.bz2 linux-stable-80cc38b16389849a6e06441ace4530f6b2497c3c.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina:
"The usual stuff from trivial tree"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (34 commits)
treewide: relase -> release
Documentation/cgroups/memory.txt: fix stat file documentation
sysctl/net.txt: delete reference to obsolete 2.4.x kernel
spinlock_api_smp.h: fix preprocessor comments
treewide: Fix typo in printk
doc: device tree: clarify stuff in usage-model.txt.
open firmware: "/aliasas" -> "/aliases"
md: bcache: Fixed a typo with the word 'arithmetic'
irq/generic-chip: fix a few kernel-doc entries
frv: Convert use of typedef ctl_table to struct ctl_table
sgi: xpc: Convert use of typedef ctl_table to struct ctl_table
doc: clk: Fix incorrect wording
Documentation/arm/IXP4xx fix a typo
Documentation/networking/ieee802154 fix a typo
Documentation/DocBook/media/v4l fix a typo
Documentation/video4linux/si476x.txt fix a typo
Documentation/virtual/kvm/api.txt fix a typo
Documentation/early-userspace/README fix a typo
Documentation/video4linux/soc-camera.txt fix a typo
lguest: fix CONFIG_PAE -> CONFIG_x86_PAE in comment
...
Diffstat (limited to 'drivers/of')
-rw-r--r-- | drivers/of/fdt.c | 2 | ||||
-rw-r--r-- | drivers/of/pdt.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 808be06bb67e..6bb7cf2de556 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -709,7 +709,7 @@ void __init unflatten_device_tree(void) __unflatten_device_tree(initial_boot_params, &of_allnodes, early_init_dt_alloc_memory_arch); - /* Get pointer to "/chosen" and "/aliasas" nodes for use everywhere */ + /* Get pointer to "/chosen" and "/aliases" nodes for use everywhere */ of_alias_scan(early_init_dt_alloc_memory_arch); } diff --git a/drivers/of/pdt.c b/drivers/of/pdt.c index 37b56fd716e6..4ec19cbee57f 100644 --- a/drivers/of/pdt.c +++ b/drivers/of/pdt.c @@ -251,6 +251,6 @@ void __init of_pdt_build_devicetree(phandle root_node, struct of_pdt_ops *ops) of_allnodes->child = of_pdt_build_tree(of_allnodes, of_pdt_prom_ops->getchild(of_allnodes->phandle), &nextp); - /* Get pointer to "/chosen" and "/aliasas" nodes for use everywhere */ + /* Get pointer to "/chosen" and "/aliases" nodes for use everywhere */ of_alias_scan(kernel_tree_alloc); } |