summaryrefslogtreecommitdiff
path: root/fs/nfsd
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-09-12 13:58:35 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-09-12 13:58:35 -0700
commit0e6a1fb1167b8d230c6edcebd31e173cd0add1e5 (patch)
treea8efc4db93bb3c80f3bc0c55226787c5607f76d0 /fs/nfsd
parent1d7b24ff335489dd7e864b71ba5b35eaa25b625a (diff)
parent171b3f0da71cfe5b21b02092ef363baf848e8587 (diff)
downloadlinux-0e6a1fb1167b8d230c6edcebd31e173cd0add1e5.tar.gz
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 'fs/nfsd')
0 files changed, 0 insertions, 0 deletions