diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-12-14 12:08:53 -0500 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-12-14 12:08:53 -0500 |
| commit | 1226e419377fb4b53d6e08c0a9fd5ecf90597cd6 (patch) | |
| tree | 4dc413e65d771150bea650eeccaf45cf59ef3727 /arch/arm/mach-omap2 | |
| parent | ec5237f097a75b7f4d19b87377ef1557431fb199 (diff) | |
| parent | e82b9d821ecc1f857142a55b0fb38d0d5256fbaf (diff) | |
Merge branch 'thermal_cpu_cooling' of git://git.linaro.org/people/amitdanielk/linux into linaro-3.1linux-linaro-3.1-2011.12-0
Conflicts:
drivers/thermal/Kconfig
drivers/thermal/Makefile
Diffstat (limited to 'arch/arm/mach-omap2')
0 files changed, 0 insertions, 0 deletions