Revert "fixed last 2 commits"

This reverts commit c2bd2db630b0aab968b36df56b46947d18801375.

Conflicts:
	drivers/staging/Makefile
Revert "move zsmalloc to mm"

This reverts commit aa6fec3397dca61613aab5b6ad198cb9e0541423.
Update zsmalloc to Linux kernel 3.11

Conflicts:
	drivers/staging/zsmalloc/Kconfig
	drivers/staging/zsmalloc/zsmalloc-main.c
	drivers/staging/zsmalloc/zsmalloc.h
	drivers/staging/zsmalloc/zsmalloc_int.h