Merge branches 'devel-cleanup', 'devel-serial' and 'devel-board' into omap-for-linus
authorTony Lindgren <tony@atomide.com>
Tue, 30 Nov 2010 22:13:15 +0000 (14:13 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 30 Nov 2010 22:13:15 +0000 (14:13 -0800)
commit9c7bc451e41abf78b0fd856a9f916f7d39e26297
treed643495fab1eb013ae3f5e689cf3cec9702b8f62
parent2862945bf5262d516583477ce420a2f122306f43
parent662b083a87a3489f3f19c6e0651c1b99b0de5df0
parent1cb125caf2e0fdece14f72efbb3516f5c5fe1de9
Merge branches 'devel-cleanup', 'devel-serial' and 'devel-board' into omap-for-linus
arch/arm/mach-omap1/board-ams-delta.c
arch/arm/mach-omap1/serial.c