summaryrefslogtreecommitdiffstats
path: root/Documentation/features
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-09-09 10:27:59 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-09-09 10:27:59 -0700
commit065d80b4bf314df143aa9f260a154a24e33b4fbe (patch)
tree51558ec7a9e760f7f9798979586e4a65c76cefa4 /Documentation/features
parent949feacb8af3659037dd34ef177e9bc727627859 (diff)
parente7e98d76777ffba334bbf7a61939c5de48acc5a0 (diff)
downloadlinux-065d80b4bf314df143aa9f260a154a24e33b4fbe.tar.bz2
Merge tag 'metag-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag
Pull metag updates from James Hogan: "Metag architecture changes for v4.3. Just a couple of changes for v4.3-rc1. A preparatory IRQ patch to prepare for moving irq_data struct members, and a tweak to Documentation/features since Meta2 could support THP" * tag 'metag-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag: Documentation/features/vm: Meta2 is capable of THP metag/irq: Use access helper irq_data_get_affinity_mask()
Diffstat (limited to 'Documentation/features')
-rw-r--r--Documentation/features/vm/THP/arch-support.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/features/vm/THP/arch-support.txt b/Documentation/features/vm/THP/arch-support.txt
index 972d02c2a74c..df384e3e845f 100644
--- a/Documentation/features/vm/THP/arch-support.txt
+++ b/Documentation/features/vm/THP/arch-support.txt
@@ -20,7 +20,7 @@
| ia64: | TODO |
| m32r: | .. |
| m68k: | .. |
- | metag: | .. |
+ | metag: | TODO |
| microblaze: | .. |
| mips: | ok |
| mn10300: | .. |