summaryrefslogtreecommitdiff
path: root/Documentation/devicetree
diff options
context:
space:
mode:
authorZhang Rui <rui.zhang@intel.com>2016-05-18 15:37:08 +0800
committerZhang Rui <rui.zhang@intel.com>2016-05-18 15:37:08 +0800
commit88ac99063e6e38bf9577e75f0d65dd02e2326d58 (patch)
treeb04a8677c0bbd2c64d0dfe3957bf32287813a148 /Documentation/devicetree
parent191b07541fcdd1de1ccc71d00bc28ca5060dd484 (diff)
parent5af897e433e6ba2963c0edcb12f2f75c53d5fae4 (diff)
parent431c30f74cdffba6456b52742e80f9b629228940 (diff)
downloadlinux-88ac99063e6e38bf9577e75f0d65dd02e2326d58.tar.gz
Merge branches 'thermal-core', 'thermal-intel' and 'thermal-soc' into next