diff options
author | Zhang Rui <rui.zhang@intel.com> | 2013-05-28 10:46:46 +0800 |
---|---|---|
committer | Zhang Rui <rui.zhang@intel.com> | 2013-05-28 10:46:46 +0800 |
commit | e7cd7886ef0478aaab23f445e2e8cd6e0e6bdd73 (patch) | |
tree | 35798898d863e9ca20a453de36623e84b527bfd5 /drivers/thermal/armada_thermal.c | |
parent | 5454f211ddc2a8ebc1eb20aa3866c4e9cf11405f (diff) | |
parent | a1cf1150f127f78783f86c695f10337391fc8092 (diff) | |
parent | c21bec86b6e36143a1fc0be60bbd9dfaebcb88a0 (diff) | |
parent | 794b2e2548ec41d81c5272f883011a13612f2fda (diff) | |
download | blackbird-op-linux-e7cd7886ef0478aaab23f445e2e8cd6e0e6bdd73.tar.gz blackbird-op-linux-e7cd7886ef0478aaab23f445e2e8cd6e0e6bdd73.zip |
Merge branches 'misc', 'drv_cleanup', 'devm-cleanup' and 'ti-soc' of .git into next