git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c308b56 fde7d90)
Merge tag 'v3.3-rc7' into sched/core
authorIngo Molnar <mingo@elte.hu>
Tue, 13 Mar 2012 15:26:52 +0000 (16:26 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 13 Mar 2012 15:26:52 +0000 (16:26 +0100)
Merge reason: merge back final fixes, prepare for the merge window.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
1  2 
include/linux/sched.h patch | diff1 | diff2 | blob | history
kernel/printk.c patch | diff1 | diff2 | blob | history

diff --cc include/linux/sched.h
Simple merge
diff --cc kernel/printk.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.