| commit | cf9b59e9d3e008591d1f54830f570982bb307a0d | [log] [tgz] |
|---|---|---|
| author | Grant Likely <grant.likely@secretlab.ca> | Sat May 22 00:36:56 2010 -0600 |
| committer | Grant Likely <grant.likely@secretlab.ca> | Sat May 22 00:36:56 2010 -0600 |
| tree | 113478ce8fd8c832ba726ffdf59b82cb46356476 | |
| parent | 44504b2bebf8b5823c59484e73096a7d6574471d [diff] | |
| parent | f4b87dee923342505e1ddba8d34ce9de33e75050 [diff] |
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>