Merge current mainline tree into linux-omap tree

author Tony Lindgren <tony@atomide.com>

Wed, 16 Jul 2008 08:22:07 +0000 (11:22 +0300)

committer Tony Lindgren <tony@atomide.com>

Wed, 16 Jul 2008 08:22:07 +0000 (11:22 +0300)
author Tony Lindgren <tony@atomide.com>
Wed, 16 Jul 2008 08:22:07 +0000 (11:22 +0300)
committer Tony Lindgren <tony@atomide.com>
Wed, 16 Jul 2008 08:22:07 +0000 (11:22 +0300)
diff --cc MAINTAINERS
Simple merge
diff --cc Makefile
Simple merge
diff --cc drivers/serial/8250.c
Simple merge
diff --cc drivers/usb/host/ohci-omap.c
Simple merge
diff --cc kernel/printk.c
Simple merge
author	Tony Lindgren <tony@atomide.com>
	Wed, 16 Jul 2008 08:22:07 +0000 (11:22 +0300)
committer	Tony Lindgren <tony@atomide.com>
	Wed, 16 Jul 2008 08:22:07 +0000 (11:22 +0300)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/serial/8250.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ohci-omap.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/printk.c	patch \|	diff1 \|	diff2 \|	blob \| history