diff options
author | Kevin Hilman <khilman@linaro.org> | 2015-06-12 13:40:12 -0700 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2015-06-12 13:40:12 -0700 |
commit | e75ea4569d6d1d10935d74ff80bad52dc09bd062 (patch) | |
tree | bc5787cd5124233f6958ef3136b8a019e5c2ffd1 /drivers/pcmcia | |
parent | 7b38951b4e1315d3427b78f2095ced8ed9dbdfda (diff) | |
parent | 2678bb9fa137726a0b83dd61a9c1636543066755 (diff) | |
download | linux-e75ea4569d6d1d10935d74ff80bad52dc09bd062.tar.bz2 |
Merge branch 'for-arm-soc' of http://ftp.arm.linux.org.uk/pub/armlinux/kernel/git-cur/linux-2.6-arm into next/cleanup
* 'for-arm-soc' of http://ftp.arm.linux.org.uk/pub/armlinux/kernel/git-cur/linux-2.6-arm:
ARM: fix EFM32 build breakage caused by cpu_resume_arm
ARM: 8389/1: Add cpu_resume_arm() for firmwares that resume in ARM state
ARM: v7 setup function should invalidate L1 cache
Diffstat (limited to 'drivers/pcmcia')
0 files changed, 0 insertions, 0 deletions