arch/arm/plat-omap/include/mach/pm.h · 90e758af52ba803cba233fabee81176d99589f09 · linux / linux-davinci

Merge current mainline tree into linux-omap tree · 90e758af

Tony Lindgren authored Mar 23, 2009

Merge branches 'master' and 'linus'

Conflicts:
	arch/arm/mach-omap2/board-omap3beagle.c
	arch/arm/plat-omap/include/mach/common.h
	arch/arm/plat-omap/include/mach/pm.h

90e758af

pm.h 9.71 KB

Replace pm.h