]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
projects / linux-2.6-omap-h63xx.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e17ba73 6329d30)
Merge branch 'linus' into core/printk
authorIngo Molnar <mingo@elte.hu>
Thu, 10 Jul 2008 06:17:14 +0000 (08:17 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 10 Jul 2008 06:17:14 +0000 (08:17 +0200)
Conflicts:

kernel/printk.c

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

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