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-20 13:21:49 -07:00
2009-01-07 09:59:58 -08:00
2010-03-02 14:53:40 -08:00
2010-05-20 13:21:35 -07:00
2009-07-12 12:22:34 -07:00
2009-09-23 06:46:35 -07:00
2008-10-17 14:40:53 -07:00
2010-05-20 13:21:41 -07:00
2010-05-20 13:21:42 -07:00