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>
2010-05-22 00:36:56 -06:00
..
base.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
device.c
of: change of_match_device to work with struct device
2010-05-22 00:10:41 -06:00
fdt.c
of/flattree: Make unflatten_device_tree() safe to call from any arch
2010-04-28 18:20:29 -06:00
gpio.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
Kconfig
of: merge of_attach_node() & of_detach_node()
2010-02-09 08:32:42 -07:00
Makefile
of_i2c.c
of: eliminate of_device->node and dev_archdata->{of,prom}_node
2010-05-18 16:10:45 -06:00
of_mdio.c
Merge remote branch 'origin' into secretlab/next-devicetree
2010-05-22 00:36:56 -06:00
of_spi.c
of: eliminate of_device->node and dev_archdata->{of,prom}_node
2010-05-18 16:10:45 -06:00
platform.c
of: change of_match_device to work with struct device
2010-05-22 00:10:41 -06:00