Merge git://git.marvell.com/orion into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 13 Dec 2008 09:12:51 +0000 (09:12 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 13 Dec 2008 09:12:51 +0000 (09:12 +0000)
1  2 
arch/arm/Makefile
arch/arm/mach-pxa/pcm990-baseboard.c

Simple merge
Simple merge