You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Grant Likely cf9b59e9d3 Merge remote branch 'origin' into secretlab/next-devicetree ... Merging in current state of Linus' tree to deal with merge conflicts and build failures in vio.c after merge. Conflicts: drivers/i2c/busses/i2c-cpm.c drivers/i2c/busses/i2c-mpc.c drivers/net/gianfar.c Also fixed up one line in arch/powerpc/kernel/vio.c to use the correct node pointer. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>		15 years ago
..
Kconfig	of: merge of_attach_node() & of_detach_node()	15 years ago
Makefile	of/flattree: merge find_flat_dt_string and initial_boot_params	15 years ago
base.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	15 years ago
device.c	of: change of_match_device to work with struct device	15 years ago
fdt.c	of/flattree: Make unflatten_device_tree() safe to call from any arch	15 years ago
gpio.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	15 years ago
of_i2c.c	of: eliminate of_device->node and dev_archdata->{of,prom}_node	15 years ago
of_mdio.c	Merge remote branch 'origin' into secretlab/next-devicetree	15 years ago
of_spi.c	of: eliminate of_device->node and dev_archdata->{of,prom}_node	15 years ago
platform.c	of: change of_match_device to work with struct device	15 years ago