]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge remote-tracking branch 'linux-uek/topic/uek-4.1/dtrace' into uek-4.1-next
authorTomas Jedlicka <tomas.jedlicka@oracle.com>
Fri, 14 Jul 2017 15:58:10 +0000 (17:58 +0200)
committerTomas Jedlicka <tomas.jedlicka@oracle.com>
Fri, 14 Jul 2017 15:58:10 +0000 (17:58 +0200)
Conflicts:
arch/sparc/kernel/ttable_64.S

1  2 
arch/sparc/include/asm/ttable.h
arch/sparc/kernel/dtrace_util.c
arch/sparc/kernel/ttable_64.S

Simple merge
Simple merge
Simple merge