git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a74a5a3
b82b6cc
)
Merge back earlier cpuidle material for 3.19-rc1.
author
Rafael J. Wysocki
<rafael.j.wysocki@intel.com>
Fri, 21 Nov 2014 15:31:42 +0000
(16:31 +0100)
committer
Rafael J. Wysocki
<rafael.j.wysocki@intel.com>
Fri, 21 Nov 2014 15:31:42 +0000
(16:31 +0100)
Conflicts:
drivers/cpuidle/dt_idle_states.c
Trivial merge