summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/pm-imx5.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-26 06:06:30 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-26 06:06:30 +0100
commit422d26b6ecd77af8c77f2a40580679459825170f (patch)
tree632e690e458fb7b27db200cd6fcd5429e143e419 /arch/arm/mach-imx/pm-imx5.c
parentwatchdog: Convert to devm_ioremap_resource() (diff)
parentLinux 3.8-rc5 (diff)
downloadlinux-422d26b6ecd77af8c77f2a40580679459825170f.tar.xz
linux-422d26b6ecd77af8c77f2a40580679459825170f.zip
Merge 3.8-rc5 into driver-core-next
This resolves a gpio driver merge issue pointed out in linux-next. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/mach-imx/pm-imx5.c')
0 files changed, 0 insertions, 0 deletions