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-11-16 02:54:07 -08:00
2009-11-02 04:19:42 -08:00
2009-12-16 07:20:19 -08:00
2010-04-14 02:04:29 -07:00
2009-11-02 04:19:42 -08:00
2010-03-12 15:52:32 -08:00
2009-12-11 06:44:58 -05:00
2010-04-12 23:46:17 -07:00