git » linux-kernel » commit cf9b59e

Merge remote branch 'origin' into secretlab/next-devicetree

author Grant Likely
2010-05-22 06:36:56 UTC
committer Grant Likely
2010-05-22 06:36:56 UTC
parent 44504b2bebf8b5823c59484e73096a7d6574471d
parent f4b87dee923342505e1ddba8d34ce9de33e75050
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>