| commit | 5f01feb8b97a4d65caa1456cb12f0f770497347f | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sat, 15 Nov 2014 23:45:07 +0000 (15 15:45 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sat, 15 Nov 2014 23:45:07 +0000 (15 15:45 -0800) | ||
| tree | 765682478831281bf8ce650def998a07839e04bd | treesnapshot (tar.gz zip) |
| parent | 555e5986bab6715ad6e39a35aeb67a218cc80abf | commitdiff |
| parent | 08b964ff3c51b10aaf2e6ba639f40054c09f0f7a | commitdiff |
Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
Pull ARM fixes from Russell King:
"Two fixes this time, one to ensure that the kuser helper option
depends on MMU as they aren't available for noMMU targets (and if the
option is selected, we end up oopsing.)
The second fix plugs a corner case with the decompressor, ensuring
that the instruction stream can see the relocated code in every case
on ARMv7 CPUs"
* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
ARM: 8198/1: make kuser helpers depend on MMU
ARM: 8191/1: decompressor: ensure I-side picks up relocated code
Pull ARM fixes from Russell King:
"Two fixes this time, one to ensure that the kuser helper option
depends on MMU as they aren't available for noMMU targets (and if the
option is selected, we end up oopsing.)
The second fix plugs a corner case with the decompressor, ensuring
that the instruction stream can see the relocated code in every case
on ARMv7 CPUs"
* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
ARM: 8198/1: make kuser helpers depend on MMU
ARM: 8191/1: decompressor: ensure I-side picks up relocated code