![]() 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> |
||
---|---|---|
.. | ||
ibmvfc.c | ||
ibmvfc.h | ||
ibmvscsi.c | ||
ibmvscsi.h | ||
ibmvstgt.c | ||
iseries_vscsi.c | ||
Makefile | ||
rpa_vscsi.c | ||
viosrp.h |