some updates to linux 3.10(mrg666)

Conflicts:
	kernel/smp.c
fix