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
..
2006-12-11 14:34:35 -08:00
2010-03-30 22:02:32 +09:00
2010-03-30 22:02:32 +09:00
2008-07-10 14:49:39 +01:00
2010-04-20 16:37:13 -07:00
2010-04-14 16:11:33 -07:00
2008-06-10 12:46:52 -07:00
2010-03-30 22:02:32 +09:00
2005-04-16 15:20:36 -07:00
2010-05-22 00:10:40 -06:00
2008-08-29 02:14:59 -07:00
2010-04-14 16:11:33 -07:00
2008-06-17 16:21:44 -07:00
2010-03-30 22:02:32 +09:00
2007-10-14 12:41:51 -07:00
2010-03-30 22:02:32 +09:00
2006-06-29 16:58:12 -07:00
2005-04-16 15:20:36 -07:00
2010-03-30 22:02:32 +09:00
2008-09-21 21:38:26 -07:00
2010-03-30 22:02:32 +09:00
2008-05-14 23:28:47 -07:00
2010-05-17 17:44:36 -07:00
2010-03-30 22:02:32 +09:00
2008-12-26 01:26:11 -08:00
2005-04-16 15:20:36 -07:00
2010-03-30 22:02:32 +09:00
2008-04-19 18:10:46 -07:00
2007-07-18 01:46:53 -07:00
2008-05-20 14:52:25 -07:00
2009-05-07 19:49:44 +01:00
2010-03-30 22:02:32 +09:00
2010-03-30 22:02:32 +09:00
2008-06-17 16:19:24 -07:00
2005-04-16 15:20:36 -07:00
2005-04-16 15:20:36 -07:00
2010-03-30 22:02:32 +09:00
2005-04-16 15:20:36 -07:00
2010-03-30 22:02:32 +09:00
2006-06-30 19:25:36 +02:00
2005-04-16 15:20:36 -07:00