Merge master.kernel.org:/home/rmk/linux-2.6-serial

author Linus Torvalds <torvalds@g5.osdl.org>

Thu, 8 Sep 2005 22:30:14 +0000 (15:30 -0700)

committer Linus Torvalds <torvalds@g5.osdl.org>

Thu, 8 Sep 2005 22:30:14 +0000 (15:30 -0700)
author Linus Torvalds <torvalds@g5.osdl.org>
Thu, 8 Sep 2005 22:30:14 +0000 (15:30 -0700)
committer Linus Torvalds <torvalds@g5.osdl.org>
Thu, 8 Sep 2005 22:30:14 +0000 (15:30 -0700)
diff --cc arch/arm/mach-omap1/board-voiceblue.c
Simple merge
diff --cc arch/arm/mach-omap1/serial.c
Simple merge
author	Linus Torvalds <torvalds@g5.osdl.org>
	Thu, 8 Sep 2005 22:30:14 +0000 (15:30 -0700)
committer	Linus Torvalds <torvalds@g5.osdl.org>
	Thu, 8 Sep 2005 22:30:14 +0000 (15:30 -0700)
		1	2
arch/arm/mach-omap1/board-voiceblue.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/serial.c	patch \|	diff1 \|	diff2 \|	blob \| history