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
..
2009-06-16 22:42:16 +01:00
2008-01-27 18:14:45 +01:00
2010-04-20 01:16:57 +01:00
2009-04-07 10:23:34 +01:00
2010-04-20 01:17:13 +01:00
2010-05-02 09:35:38 +01:00