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-01-11 18:22:30 -06:00
2010-05-02 16:02:11 -04:00
2010-05-02 15:54:31 -04:00
2010-05-02 15:55:17 -04:00
2008-08-29 02:13:10 -07:00
2010-04-11 09:23:31 -05:00
2010-05-02 15:54:47 -04:00
2010-05-02 11:02:17 -04:00
2010-01-18 10:48:08 -06:00
2010-02-09 11:13:56 +01:00
2008-12-28 20:00:03 +01:00
2010-05-02 15:55:03 -04:00
2008-01-30 13:14:02 -06:00
2010-02-09 11:13:56 +01:00
2008-01-30 13:14:02 -06:00
2009-12-10 08:54:15 -06:00
2008-02-07 18:02:44 -06:00
2009-12-10 08:54:13 -06:00