Merge branch 'master' of git://git.marvell.com/orion into devel

author Russell King <rmk@dyn-67.arm.linux.org.uk>

Thu, 19 Mar 2009 23:10:40 +0000 (23:10 +0000)

committer Russell King <rmk+kernel@arm.linux.org.uk>

Thu, 19 Mar 2009 23:10:40 +0000 (23:10 +0000)
author Russell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 19 Mar 2009 23:10:40 +0000 (23:10 +0000)
committer Russell King <rmk+kernel@arm.linux.org.uk>
Thu, 19 Mar 2009 23:10:40 +0000 (23:10 +0000)
diff --cc arch/arm/kernel/entry-common.S
Simple merge
diff --cc arch/arm/mach-mx1/mx1ads.c
Simple merge
diff --cc arch/arm/mach-omap2/board-omap3beagle.c
Simple merge
diff --cc arch/arm/plat-omap/common.c
Simple merge
diff --cc arch/arm/plat-omap/include/mach/common.h
Simple merge
diff --cc arch/arm/plat-omap/include/mach/pm.h
Simple merge
author	Russell King <rmk@dyn-67.arm.linux.org.uk>
	Thu, 19 Mar 2009 23:10:40 +0000 (23:10 +0000)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Thu, 19 Mar 2009 23:10:40 +0000 (23:10 +0000)
		1	2
arch/arm/kernel/entry-common.S	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx1/mx1ads.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-omap3beagle.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/common.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/mach/common.h	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/mach/pm.h	patch \|	diff1 \|	diff2 \|	blob \| history