Merge master.kernel.org:/home/rmk/linux-2.6-serial
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 8 Sep 2005 22:30:14 +0000 (15:30 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 8 Sep 2005 22:30:14 +0000 (15:30 -0700)
commit0db7443b2bd0b92da4e8afa46f8123a7076136c6
tree325c388b7d99015896b583dfec775a837957b762
parent63068465fa9ba8258e341f70c07cd2221b8c114d
parent6df29debb7fc04ac3f92038c57437f40bab4e72d
Merge master.kernel.org:/home/rmk/linux-2.6-serial
arch/arm/mach-omap1/board-voiceblue.c
arch/arm/mach-omap1/serial.c