]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch topic/uek-4.1/uek-carry of git://ca-git.us.oracle.com/linux-uek into...
authorChuck Anderson <chuck.anderson@oracle.com>
Sat, 11 Jun 2016 00:49:06 +0000 (17:49 -0700)
committerChuck Anderson <chuck.anderson@oracle.com>
Sat, 11 Jun 2016 00:49:06 +0000 (17:49 -0700)
1  2 
kernel/trace/trace.c

Simple merge