git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
30072fb
23be63f
)
Merge branch 'cpu-package-thermal' of .git into next
author
Zhang Rui
<rui.zhang@intel.com>
Mon, 17 Jun 2013 22:31:26 +0000
(06:31 +0800)
committer
Zhang Rui
<rui.zhang@intel.com>
Mon, 17 Jun 2013 22:31:26 +0000
(06:31 +0800)
Conflicts:
drivers/thermal/Kconfig
drivers/thermal/Makefile
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff