diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-05-13 17:17:33 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-05-13 17:17:33 +0300 |
| commit | 6c28ab9fef9b4eca350d68ed0090f92fe37f969f (patch) | |
| tree | e7f361fc83d13b7c7823abf925eb0365ad9e5fa0 /arch/arm/mm/alignment.c | |
| parent | 31fc835fc787aad38e8985d593f8ad0d18825323 (diff) | |
| parent | 3f937cf3db466093c533efbcd601952509727a9d (diff) | |
| download | linux-6c28ab9fef9b4eca350d68ed0090f92fe37f969f.tar.xz | |
Merge tag 'v4.1-rockchip-socfixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into fixes
The previous two suspend related fixes both fix the same issue
so only one of them (the newer one) is actually needed.
* tag 'v4.1-rockchip-socfixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
Revert "ARM: rockchip: fix undefined instruction of reset_ctrl_regs"
Diffstat (limited to 'arch/arm/mm/alignment.c')
0 files changed, 0 insertions, 0 deletions