git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2fd1db8
bbf7fc8
)
Merge branch 'thermal' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux...
author
Zhang Rui
<rui.zhang@intel.com>
Mon, 15 Apr 2013 01:26:58 +0000
(09:26 +0800)
committer
Zhang Rui
<rui.zhang@intel.com>
Mon, 15 Apr 2013 01:26:58 +0000
(09:26 +0800)
Conflicts:
drivers/thermal/cpu_cooling.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff