diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-08 16:46:56 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-08 16:46:56 +0100 |
commit | 3ad1f3b35e8309ec93454dbf89beaafcdb5312da (patch) | |
tree | d26e60c334b70adc310b807a33d3491dc205d52d /drivers/net/Kconfig | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl-2.6 (diff) | |
parent | of: merge of_find_all_nodes() implementations (diff) | |
download | linux-3ad1f3b35e8309ec93454dbf89beaafcdb5312da.tar.xz linux-3ad1f3b35e8309ec93454dbf89beaafcdb5312da.zip |
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
* 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6:
of: merge of_find_all_nodes() implementations
of: merge other miscellaneous prototypes
of: merge of_*_flat_dt*() functions
of: merge of_node_get(), of_node_put() and of_find_all_nodes()
of: merge of_read_number() an of_read_ulong()
of: merge of_node_*_flag() and set_node_proc_entry()
of: merge struct boot_param_header from Microblaze and PowerPC
of: add common header for flattened device tree representation
of: Move OF_IS_DYNAMIC and OF_MARK_DYNAMIC macros to of.h
of: merge struct device_node
of: merge phandle, ihandle and struct property
of: Rework linux/of.h and asm/prom.h include ordering
Diffstat (limited to 'drivers/net/Kconfig')
0 files changed, 0 insertions, 0 deletions