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-09-24 07:21:03 -07:00
2010-05-17 09:08:18 +10:00
2010-02-09 11:13:56 +01:00
2010-04-23 02:08:44 +02:00
2009-10-04 15:05:10 -07:00
2010-05-17 03:06:12 +02:00
2010-05-21 09:34:29 -07:00
2009-12-10 22:55:36 +01:00
2010-05-21 09:34:29 -07:00
2010-05-21 09:34:29 -07:00
2009-07-12 12:22:34 -07:00
2010-05-20 19:55:01 +10:00
2009-07-12 12:22:34 -07:00
2009-06-11 08:51:01 -07:00
2010-05-21 09:34:31 -07:00
2009-07-12 12:22:34 -07:00
2009-09-01 01:13:31 -07:00
2009-10-14 17:36:53 +02:00
2010-01-04 12:31:21 -08:00
2010-03-02 14:43:22 -08:00
2010-02-09 11:13:56 +01:00