]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge remote-tracking branch 'linux-uek/topic/uek-4.1/dtrace' into qu6-push
authorTomas Jedlicka <tomas.jedlicka@oracle.com>
Thu, 13 Jul 2017 16:56:40 +0000 (18:56 +0200)
committerTomas Jedlicka <tomas.jedlicka@oracle.com>
Thu, 13 Jul 2017 16:56:40 +0000 (18:56 +0200)

Trivial merge