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
..
2008-06-04 17:50:17 +01:00
2008-06-04 17:50:17 +01:00
2008-12-10 13:01:32 +00:00
2010-05-13 21:23:06 +01:00
2010-05-13 21:23:06 +01:00
2010-05-14 03:23:01 +01:00
2008-06-04 17:50:17 +01:00
2008-06-04 17:50:17 +01:00
2008-12-10 13:01:20 +00:00
2008-06-04 17:50:17 +01:00
2010-05-13 21:23:06 +01:00
2008-06-04 17:50:17 +01:00
2008-06-04 17:50:17 +01:00
2008-06-04 17:50:17 +01:00