diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2014-12-24 10:38:30 +0800 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2014-12-24 10:38:30 +0800 |
| commit | 7429b1e0d00e62426c74a45195ba72149cb9ad64 (patch) | |
| tree | c22a487d2f051f147dd0ff234ac566e741ac3c6e /fs/squashfs/file_cache.c | |
| parent | fc4de356e033a46a08caf78027df871cc20780c1 (diff) | |
| parent | 0733d1387ed8b845a6b60121f06ddbe9e24f12ea (diff) | |
| parent | f8061d383b09ed933a49ac3fd301c2f991261851 (diff) | |
Merge branches 'thermal-core', 'thermal-soc' and 'thermal-int340x' of .git into next