Merge branch 'akpm' (second patchbomb from Andrew Morton)
[pandora-kernel.git] / kernel / sys.c
diff --cc kernel/sys.c
Simple merge