git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1e1f3f2
50ad147
)
Pull d-states into release branch
author
Len Brown
<len.brown@intel.com>
Wed, 25 Jul 2007 05:36:31 +0000
(
01:36
-0400)
committer
Len Brown
<len.brown@intel.com>
Wed, 25 Jul 2007 05:36:31 +0000
(
01:36
-0400)
Conflicts:
drivers/acpi/sleep/main.c
Signed-off-by: Len Brown <len.brown@intel.com>
Trivial merge