kernel/linux
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ synced 2026-09-22 18:22:42 +00:00
Code Issues Releases Packages Activity
linux/mm/oom_kill.c
James Morris 2b82892565 Merge branch 'master' into next 
Conflicts:
	security/keys/internal.h
	security/keys/process_keys.c
	security/keys/request_key.c

Fixed conflicts above by using the non 'tsk' versions.

Signed-off-by: James Morris <jmorris@namei.org>
2008-11-14 11:29:12 +11:00

593 lines
15 KiB
Raw Blame History