Files
android_kernel_xiaomi_sm8450/arch/powerpc/kernel
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
..
2007-05-11 05:38:25 -04:00
2010-03-05 03:04:08 -06:00
2010-05-05 09:11:10 -04:00
2010-05-17 12:18:52 +03:00
2010-03-05 03:04:08 -06:00
2010-05-05 09:11:10 -04:00
2010-05-17 12:19:07 +03:00
2010-03-09 11:52:52 +11:00
2009-07-12 12:22:34 -07:00
2010-03-12 15:52:32 -08:00
2007-10-11 14:36:47 +10:00