Merge branches 'for-rc' and 'ti-soc' of .git into next
authorZhang Rui <rui.zhang@intel.com>
Thu, 13 Jun 2013 03:19:36 +0000 (11:19 +0800)
committerZhang Rui <rui.zhang@intel.com>
Thu, 13 Jun 2013 03:19:36 +0000 (11:19 +0800)
commit30072fb91e1447b00fa148500c49010265b530c6
tree1dc52bb04d5f8ccf41a4d2b30d1a3f2d535d3179
parente7cd7886ef0478aaab23f445e2e8cd6e0e6bdd73
parent0c872507d84a6193cd769a808e65d34e1514b083
parentca0c711463565a8735b24f3b08310287adb6b4c9
Merge branches 'for-rc' and 'ti-soc' of .git into next
drivers/thermal/thermal_core.c