Merge remote branch 'origin' into sim-ns3-dev-branch
based on 3.9.0 kernel.

arch/sim/proc.c, sysctl.c, workqeueu.c were refined along with the refactor of upstream.

Conflicts:
	include/linux/slab.h
revert slab.h to original
add arch/sim support again