diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-06 22:51:27 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-06 22:51:27 +0100 |
| commit | dd273a8071124c2235c45d2ca756acc90ca31ed3 (patch) | |
| tree | 805bb65c17779ce1f16245b56d5e9ccbd7309f27 /arch/x86/include/asm/pci.h | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sag... (diff) | |
| parent | ARM: 8544/1: set_memory_xx fixes (diff) | |
| download | linux-dd273a8071124c2235c45d2ca756acc90ca31ed3.tar.xz linux-dd273a8071124c2235c45d2ca756acc90ca31ed3.zip | |
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 'arch/x86/include/asm/pci.h')
0 files changed, 0 insertions, 0 deletions