diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-12 22:58:35 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-12 22:58:35 +0200 |
| commit | 0e6a1fb1167b8d230c6edcebd31e173cd0add1e5 (patch) | |
| tree | a8efc4db93bb3c80f3bc0c55226787c5607f76d0 /mm/memory-failure.c | |
| parent | Merge tag 'nfs-for-3.12-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs (diff) | |
| parent | ARM: sort arch/arm/Kconfig (diff) | |
| download | linux-0e6a1fb1167b8d230c6edcebd31e173cd0add1e5.tar.xz linux-0e6a1fb1167b8d230c6edcebd31e173cd0add1e5.zip | |
Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm
Pull ARM fixes from Russell King:
"Just two fixes here - one for the recent addition of Neon stuff which
causes problems when this is built as a module. The other was one
spotted by Olof with the fixed-HZ stuff.
Last patch (which is at the very top) is not a fix per-se, but an
almost-end-of-merge window sorting of the select symbols in
arch/arm/Kconfig to keep them as akpm would like to reduce unnecessary
conflicts. I've also taken the liberty this time to add a comment at
the end to discourage the endless "add the next select to the bottom
of a nicely sorted list" syndrome"
* 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
ARM: sort arch/arm/Kconfig
ARM: fix forced-HZ values
ARM: 7835/2: fix modular build of xor_blocks() with NEON enabled
Diffstat (limited to 'mm/memory-failure.c')
0 files changed, 0 insertions, 0 deletions