aboutsummaryrefslogtreecommitdiffstats
path: root/tools/nfsd/inject_fault.sh
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-02-21 14:12:07 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2015-02-21 14:12:07 -0500
commitf9677375b0c07e39c78b43aab9fb2c253a4b50c2 (patch)
tree1bdec250120dca436cd210813d475e24397c1886 /tools/nfsd/inject_fault.sh
parentf3c233d75ed0dd04e9eaf7cb43d79756fef1ef3a (diff)
parentc11a25f443e9bee06fe302b6a78ff44dac554036 (diff)
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull Intel Quark SoC support from Ingo Molnar: "This adds support for Intel Quark X1000 SoC boards, used in the low power 32-bit x86 Intel Galileo microcontroller board intended for the Arduino space. There's been some preparatory core x86 patches for Quark CPU quirks merged already, but this rounds it all up and adds Kconfig enablement. It's a clean hardware enablement addition tree at this point" * 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/intel/quark: Fix simple_return.cocci warnings x86/intel/quark: Fix ptr_ret.cocci warnings x86/intel/quark: Add Intel Quark platform support x86/intel/quark: Add Isolated Memory Regions for Quark X1000
Diffstat (limited to 'tools/nfsd/inject_fault.sh')
0 files changed, 0 insertions, 0 deletions