fixes
more updates from linux 3.2.y
oom_kill: update to linux 3.4.48

Conflicts:
	mm/oom_kill.c
mm: updates from linux 3.4.48
memory.c: update to linux 3.3.y
memory.c: update to linux 3.4.48

Conflicts:
	mm/mmap.c
stuff