diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-18 21:03:48 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-18 21:03:48 +0300 |
commit | 9d37e6679dfddbb5fa605fb2d7ff448f7cd6d038 (patch) | |
tree | 7768cf19970973c436907dda0e58bc51217b265d /drivers/crypto/nx/nx_csbcpb.h | |
parent | 0e1dbccd8f60c1c83d86d693bb87363b7de2319c (diff) | |
parent | 0871b7248113ebfccbfabcd3fd1f867a2bc681f4 (diff) | |
download | linux-9d37e6679dfddbb5fa605fb2d7ff448f7cd6d038.tar.xz |
Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
Pull ARM fixes from Russell King:
"A small set of ARM fixes for -rc3, most of them not far off
one-liners, with the exception of fixing the V7 cache invalidation for
incoming SMP processors which was causing problems for SoCFPGA
devices"
* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
ARM: fix __virt_to_idmap build error on !MMU
ARM: invalidate L1 before enabling coherency
ARM: 8404/1: dma-mapping: fix off-by-one error in bitmap size check
ARM: 8402/1: perf: Don't use of_node after putting it
ARM: 8400/1: use virt_to_idmap to get phys_reset address
Diffstat (limited to 'drivers/crypto/nx/nx_csbcpb.h')
0 files changed, 0 insertions, 0 deletions