diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2014-07-22 10:13:00 +0800 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2014-07-22 10:13:00 +0800 |
| commit | 47d104ba5879790c7c91c3390b0b08399e168efe (patch) | |
| tree | 0573b8731b8cd2457508615c7547428f557099ec /drivers/thermal/Kconfig | |
| parent | 1fe56dc16a3dab400206443f70ae158c8f595c42 (diff) | |
| parent | b3dee3905c19d4897386ee0282004b9723a7b6c9 (diff) | |
| parent | 5fcdeb20df2085580819c665ae50f7dae964c27d (diff) | |
| parent | c708a98f01068fe07f77448031f9f5317423e777 (diff) | |
| parent | fa313103c953fd832b7c4e431c74be55c20b1ce1 (diff) | |
| parent | 6ea95b50dd2ed206dbaac25202f2e11076c2c8c4 (diff) | |
Merge branches 'exynos-fix', 'for-rc', 'int3403-fix', 'misc', 'rcar-thermal' and 'sti-thermal' of .git into next