diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-01 02:52:08 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-01 02:52:08 (GMT) |
| commit | aad7fb916a10f1065ad23de0c80a4a04bcba8437 (patch) | |
| tree | 9e091817ac2fff165c945be2d1c28b11aec344cd /fs/btrfs/file.c | |
| parent | fe82dcec644244676d55a1384c958d5f67979adb (diff) | |
| parent | ad684dce87fac52738649e62b4afa25081b52a28 (diff) | |
| download | linux-aad7fb916a10f1065ad23de0c80a4a04bcba8437.tar.xz | |
Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
Pull ARM fixes from Russell King:
"Some further ARM fixes:
- another build fix for the kprobes test code
- a fix for no kuser helpers for the set_tls code, which oopsed on
noMMU hardware
- a fix for alignment handler with neon opcodes being misinterpreted
- turning off the hardware access support, which is not implemented
- a build fix for the v7 coherency exiting code, which can be built
in non-v7 environments (but still only executed on v7 CPUs)"
* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
ARM: 8179/1: kprobes-test: Fix compile error "bad immediate value for offset"
ARM: 8178/1: fix set_tls for !CONFIG_KUSER_HELPERS
ARM: 8177/1: cacheflush: Fix v7_exit_coherency_flush exynos build breakage on ARMv6
ARM: 8165/1: alignment: don't break misaligned NEON load/store
ARM: 8164/1: mm: clear SCTLR.HA instead of setting it for LPAE
Diffstat (limited to 'fs/btrfs/file.c')
0 files changed, 0 insertions, 0 deletions