Merge current mainline tree into linux-omap tree

author Tony Lindgren <tony@atomide.com>

Thu, 5 Jun 2008 21:49:16 +0000 (14:49 -0700)

committer Tony Lindgren <tony@atomide.com>

Thu, 5 Jun 2008 21:49:16 +0000 (14:49 -0700)
author Tony Lindgren <tony@atomide.com>
Thu, 5 Jun 2008 21:49:16 +0000 (14:49 -0700)
committer Tony Lindgren <tony@atomide.com>
Thu, 5 Jun 2008 21:49:16 +0000 (14:49 -0700)
diff --cc MAINTAINERS
Simple merge
diff --cc Makefile
Simple merge
diff --cc drivers/serial/8250.c
Simple merge
author	Tony Lindgren <tony@atomide.com>
	Thu, 5 Jun 2008 21:49:16 +0000 (14:49 -0700)
committer	Tony Lindgren <tony@atomide.com>
	Thu, 5 Jun 2008 21:49:16 +0000 (14:49 -0700)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/serial/8250.c	patch \|	diff1 \|	diff2 \|	blob \| history