From: Grant Likely Date: Sat, 22 May 2010 06:36:56 +0000 (-0600) Subject: Merge remote branch 'origin' into secretlab/next-devicetree X-Git-Tag: v2.6.35-rc1~420^2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf9b59e9d3e008591d1f54830f570982bb307a0d;p=pandora-kernel.git 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 --- cf9b59e9d3e008591d1f54830f570982bb307a0d Reading git-diff-tree failed