diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-26 06:06:30 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-26 06:06:30 +0100 |
commit | 422d26b6ecd77af8c77f2a40580679459825170f (patch) | |
tree | 632e690e458fb7b27db200cd6fcd5429e143e419 /arch/arm/mach-imx/mach-bug.c | |
parent | watchdog: Convert to devm_ioremap_resource() (diff) | |
parent | Linux 3.8-rc5 (diff) | |
download | linux-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/mach-bug.c')
0 files changed, 0 insertions, 0 deletions