]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge remote-tracking branch 'linux-dtrace/gpl/topic/uek-4.1/dtrace' into uek-next
authorTomas Jedlicka <tomas.jedlicka@oracle.com>
Fri, 1 Sep 2017 10:15:55 +0000 (12:15 +0200)
committerTomas Jedlicka <tomas.jedlicka@oracle.com>
Fri, 1 Sep 2017 10:15:55 +0000 (12:15 +0200)
1  2 
include/uapi/linux/Kbuild

Simple merge