Merge branches 'intel-dts-soc-thermal' and 'int340x-enhancement' of .git into next
authorZhang Rui <rui.zhang@intel.com>
Fri, 30 Jan 2015 08:16:25 +0000 (16:16 +0800)
committerZhang Rui <rui.zhang@intel.com>
Fri, 30 Jan 2015 08:16:25 +0000 (16:16 +0800)
commit8cb68501e1e9c2093e0997eaf8dd45a8bceeefc0
tree0cf883c0ef19facc11413276f5bf6c7c5093d53d
parent6c355fafeb2cde3fa6bf317777ae3018b7f254e6
parent317d9dda0522c18eb230367c88601c2e46cda4f8
Merge branches 'intel-dts-soc-thermal' and 'int340x-enhancement' of .git into next