]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
Merge with /home/tmlind/src/kernel/linux-2.6
authorTony Lindgren <tony@atomide.com>
Tue, 29 Nov 2005 03:36:21 +0000 (19:36 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 29 Nov 2005 03:36:21 +0000 (19:36 -0800)
1  2 
drivers/media/video/Kconfig
drivers/mmc/mmc.c
drivers/serial/8250.c
kernel/printk.c

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