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-04-01 08:59:32 -07:00
2009-12-16 07:20:04 -08:00
2010-05-03 15:42:58 +02:00
2009-05-06 16:36:10 -07:00
2010-02-27 18:31:16 +01:00
2010-02-27 18:31:14 +01:00
2010-03-12 15:52:34 -08:00
2010-03-12 15:52:34 -08:00
2010-02-09 11:13:56 +01:00
2010-02-27 18:31:13 +01:00
2010-02-27 18:31:13 +01:00
2010-05-18 16:19:30 +10:00