summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/pm-imx6.c
AgeCommit message (Expand)Author
2014-04-05Merge tag 'soc-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm...Linus Torvalds
2014-03-05ARM: imx6: rename pm-imx6q.c to pm-imx6.cShawn Guo