diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-27 08:56:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-27 08:56:52 -0700 |
| commit | 3c2bfbaadff6e0c257bb6b16c9c97f43618b13dc (patch) | |
| tree | e395b50dab446e0f19468924565d8a90112d54a4 /block | |
| parent | Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming (diff) | |
| parent | ARM: 8682/1: V7M: Set cacheid iff DminLine or IminLine is nonzero (diff) | |
| download | linux-dev-3c2bfbaadff6e0c257bb6b16c9c97f43618b13dc.tar.xz linux-dev-3c2bfbaadff6e0c257bb6b16c9c97f43618b13dc.zip | |
Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm
Pull ARM fixes from Russell King:
"Three more fixes:
- Fix the previous fix merged in the last pull for the Thumb2
decompressor.
- A fix from Vladimir to correctly identify the V7M cache type.
- The optimised 3G vmsplit case does not work with LPAE, so don't
allow this to be selected for LPAE configurations"
* 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm:
ARM: 8682/1: V7M: Set cacheid iff DminLine or IminLine is nonzero
ARM: 8681/1: make VMSPLIT_3G_OPT depends on !ARM_LPAE
ARM: 8680/1: boot/compressed: fix inappropriate Thumb2 mnemonic for __nop
Diffstat (limited to 'block')
0 files changed, 0 insertions, 0 deletions