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
..
2010-05-14 17:35:51 -04:00
2010-04-23 02:08:44 +02:00
2010-05-19 13:36:46 -04:00
2010-05-17 22:49:02 -04:00
2010-05-19 13:36:46 -04:00
2010-05-14 17:08:01 -04:00
2010-05-19 13:38:54 -04:00
2008-01-23 05:24:15 -05:00
2010-05-17 22:49:02 -04:00
2010-05-19 13:38:54 -04:00
2009-09-08 21:17:36 -04:00
2010-05-19 13:38:54 -04:00
2010-05-19 13:36:46 -04:00
2010-05-17 22:49:02 -04:00
2007-07-02 10:17:42 -04:00