Merge master.kernel.org:/home/rmk/linux-2.6-serial
Linus Torvalds [Thu, 8 Sep 2005 22:30:14 +0000 (15:30 -0700)]
1  2 
arch/arm/mach-omap1/board-voiceblue.c
arch/arm/mach-omap1/serial.c

Simple merge
Simple merge