]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'perf/urgent' into perf/core
authorIngo Molnar <mingo@elte.hu>
Mon, 12 Mar 2012 19:44:07 +0000 (20:44 +0100)
committerIngo Molnar <mingo@elte.hu>
Mon, 12 Mar 2012 19:44:11 +0000 (20:44 +0100)
Merge reason: We are going to queue up a dependent patch.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
1  2 
fs/exec.c
kernel/printk.c

diff --cc fs/exec.c
Simple merge
diff --cc kernel/printk.c
Simple merge