Merge branch 'master' of git://git.marvell.com/orion into devel
Russell King [Thu, 19 Mar 2009 23:10:40 +0000 (23:10 +0000)]
Conflicts:

arch/arm/mach-mx1/devices.c

1  2 
arch/arm/kernel/entry-common.S
arch/arm/mach-mx1/mx1ads.c
arch/arm/mach-omap2/board-omap3beagle.c
arch/arm/plat-omap/common.c
arch/arm/plat-omap/include/mach/common.h
arch/arm/plat-omap/include/mach/pm.h

Simple merge
Simple merge
Simple merge
Simple merge