Tony Lindgren 48cb1258e8 Merge branch 'for_3.1/pm-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into devel-cleanup ...

Conflicts:
	arch/arm/mach-omap2/pm-debug.c
	arch/arm/mach-omap2/pm.h

2011-06-29 04:45:16 -07:00

5.9 KiB

Raw Blame History

View Raw