summaryrefslogtreecommitdiffstats
path: root/include/trace
diff options
context:
space:
mode:
authorZhang Rui <rui.zhang@intel.com>2014-10-17 14:30:58 +0800
committerZhang Rui <rui.zhang@intel.com>2014-10-17 14:30:58 +0800
commit6ceaf58abe25e86292152005c51169796bad3407 (patch)
treee97a032bc9dc63da9939136bd32ed5e0ad0f09bc /include/trace
parent9ceaa81efd1dd5ec83cf6be5a9445809583a03b6 (diff)
parentd8054749c6795073cb427465a726213d45898f68 (diff)
downloadlinux-6ceaf58abe25e86292152005c51169796bad3407.tar.bz2
Merge branch 'int340x-thermal' of .git into next
Diffstat (limited to 'include/trace')
0 files changed, 0 insertions, 0 deletions