diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-17 14:25:09 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-17 14:25:09 -1000 |
| commit | e99cfa2d0634881b8a41d56c48b5956b9a3ba162 (patch) | |
| tree | 3e22ab13d8853c2866403bf5dfef3a9db5ba8abd /net/x25/x25_proc.c | |
| parent | 5ee22beeb25a5fa7fc6daf3597a8d9265f8c9ce1 (diff) | |
| parent | 99de64984c3a7c9bf56a50e6dcc51006c9485620 (diff) | |
Merge tag 'dt-fixes-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull device tree fixes from Rob Herring:
- fix microblaze compiling due to conflicting merge window changes
- a fix in of_attach_node due to of_find_node_by_path changes
- prevent format strings in DT kobject names
* tag 'dt-fixes-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
OF: fix of_find_node_by_path() assumption that of_allnodes is root
of: avoid format string parsing in kobject names
of/platform: Fix microblaze build failure
Diffstat (limited to 'net/x25/x25_proc.c')
0 files changed, 0 insertions, 0 deletions