summaryrefslogtreecommitdiff
path: root/fs/nfsd/state.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-08-29 16:28:29 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-08-29 16:28:29 -0700
commit10f3291a1d7a7dc3ded403cb3caa31916364be60 (patch)
treedc642b00558988f3e6a98d33a8f8299fc88444c3 /fs/nfsd/state.h
parent878e580e211c519c1b32a2c65786d308a759ec24 (diff)
parentb0108f9e93d0d39050eaa11358852f349bdccb71 (diff)
Merge branch 'akpm' (fixes from Andrew Morton)
Merge patches from Andrew Morton: "22 fixes" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (22 commits) kexec: purgatory: add clean-up for purgatory directory Documentation/kdump/kdump.txt: add ARM description flush_icache_range: export symbol to fix build errors tools: selftests: fix build issue with make kselftests target ocfs2: quorum: add a log for node not fenced ocfs2: o2net: set tcp user timeout to max value ocfs2: o2net: don't shutdown connection when idle timeout ocfs2: do not write error flag to user structure we cannot copy from/to x86/purgatory: use approprate -m64/-32 build flag for arch/x86/purgatory drivers/rtc/rtc-s5m.c: re-add support for devices without irq specified xattr: fix check for simultaneous glibc header inclusion kexec: remove CONFIG_KEXEC dependency on crypto kexec: create a new config option CONFIG_KEXEC_FILE for new syscall x86,mm: fix pte_special versus pte_numa hugetlb_cgroup: use lockdep_assert_held rather than spin_is_locked mm/zpool: use prefixed module loading zram: fix incorrect stat with failed_reads lib: turn CONFIG_STACKTRACE into an actual option. mm: actually clear pmd_numa before invalidating memblock, memhotplug: fix wrong type in memblock_find_in_range_node(). ...
Diffstat (limited to 'fs/nfsd/state.h')
0 files changed, 0 insertions, 0 deletions