diff options
author | Dave Airlie <airlied@redhat.com> | 2019-07-16 04:32:26 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2019-07-16 04:33:01 +1000 |
commit | f6ac3a68496efc5f1b6d2b0a2101fba03b0ab94f (patch) | |
tree | 0fa9edf1b9dac68f5a94fb013b31e0ac6ba4183a /Documentation/ide/changelogs.rst | |
parent | 3729fe2bc2a01f4cc1aa88be8f64af06084c87d6 (diff) | |
parent | fec88ab0af9706b2201e5daf377c5031c62d11f7 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-nextdrm-next-5.3-backmerge-conflicts
Example backmerge for Linus
Diffstat (limited to 'Documentation/ide/changelogs.rst')
-rw-r--r-- | Documentation/ide/changelogs.rst | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/Documentation/ide/changelogs.rst b/Documentation/ide/changelogs.rst new file mode 100644 index 000000000000..fdf9d0fb8027 --- /dev/null +++ b/Documentation/ide/changelogs.rst @@ -0,0 +1,17 @@ +Changelog for ide cd +-------------------- + + .. include:: ChangeLog.ide-cd.1994-2004 + :literal: + +Changelog for ide floppy +------------------------ + + .. include:: ChangeLog.ide-floppy.1996-2002 + :literal: + +Changelog for ide tape +---------------------- + + .. include:: ChangeLog.ide-tape.1995-2002 + :literal: |