aboutsummaryrefslogtreecommitdiff
path: root/Documentation/s390/text_files.rst
diff options
context:
space:
mode:
authorGravatar Rodrigo Vivi <rodrigo.vivi@intel.com> 2019-07-29 08:51:48 -0700
committerGravatar Rodrigo Vivi <rodrigo.vivi@intel.com> 2019-07-29 08:51:48 -0700
commited32f8d42cee118b075e4372a55c7739a11094b2 (patch)
tree5a806c5168d4177e0536b98b6bda30ec4bdbac43 /Documentation/s390/text_files.rst
parentdrm/i915: Flush the i915_vm_release before ggtt shutdown (diff)
parentLinus 5.3-rc1 (diff)
downloadlinux-ed32f8d42cee118b075e4372a55c7739a11094b2.tar.gz
linux-ed32f8d42cee118b075e4372a55c7739a11094b2.tar.bz2
linux-ed32f8d42cee118b075e4372a55c7739a11094b2.zip
Merge drm/drm-next into drm-intel-next-queued
Catching up with 5.3-rc* Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'Documentation/s390/text_files.rst')
-rw-r--r--Documentation/s390/text_files.rst11
1 files changed, 11 insertions, 0 deletions
diff --git a/Documentation/s390/text_files.rst b/Documentation/s390/text_files.rst
new file mode 100644
index 000000000000..c94d05d4fa17
--- /dev/null
+++ b/Documentation/s390/text_files.rst
@@ -0,0 +1,11 @@
+ibm 3270 changelog
+------------------
+
+.. include:: 3270.ChangeLog
+ :literal:
+
+ibm 3270 config3270.sh
+----------------------
+
+.. literalinclude:: config3270.sh
+ :language: shell