Linux 3.4.8

Conflicts:
	drivers/staging/zsmalloc/zsmalloc-main.c