diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-27 07:30:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-27 07:30:25 -0700 |
| commit | 24eb90abdd54446da5afe71f7c264fe26cfc5659 (patch) | |
| tree | 75bbb9cc5fc4e6690fd59e404900595132df5cb5 /fs | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6 (diff) | |
| parent | powerpc/5200: fix lite5200 ethernet phy address (diff) | |
| download | linux-dev-24eb90abdd54446da5afe71f7c264fe26cfc5659.tar.xz linux-dev-24eb90abdd54446da5afe71f7c264fe26cfc5659.zip | |
Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6
* 'merge' of git://git.secretlab.ca/git/linux-2.6:
powerpc/5200: fix lite5200 ethernet phy address
powerpc/5200: Fix build error in sound code.
powerpc/5200: fix oops during going to standby
powerpc/5200: add lite5200 onboard I2C eeprom and flash
maintainers: Add git trees for SPI and device tree
of: Drop properties with "/" in their name
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/proc/proc_devtree.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/proc/proc_devtree.c b/fs/proc/proc_devtree.c index ce94801f48ca..d9396a4fc7ff 100644 --- a/fs/proc/proc_devtree.c +++ b/fs/proc/proc_devtree.c @@ -209,6 +209,9 @@ void proc_device_tree_add_node(struct device_node *np, for (pp = np->properties; pp != NULL; pp = pp->next) { p = pp->name; + if (strchr(p, '/')) + continue; + if (duplicate_name(de, p)) p = fixup_name(np, de, p); |