diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-06 13:51:27 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-06 13:51:27 -0800 |
| commit | dd273a8071124c2235c45d2ca756acc90ca31ed3 (patch) | |
| tree | 805bb65c17779ce1f16245b56d5e9ccbd7309f27 /drivers/acpi/apei | |
| parent | 21b27a74ec0f4e52e001912c89570a49494705a2 (diff) | |
| parent | f474c8c857d996f34c39f66bbed23faaa739fad6 (diff) | |
Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
Pull ARM fixes from Russell King:
"Just two ARM fixes this time: one to fix the hyp-stub for older ARM
CPUs, and another to fix the set_memory_xx() permission functions to
deal with zero sizes correctly"
* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
ARM: 8544/1: set_memory_xx fixes
ARM: 8534/1: virt: fix hyp-stub build for pre-ARMv7 CPUs
Diffstat (limited to 'drivers/acpi/apei')
0 files changed, 0 insertions, 0 deletions