git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e9e8b4d
2a6b697
)
Merge branch 'bugzilla-13931-sleep-nvs' into release
author
Len Brown
<len.brown@intel.com>
Sat, 12 Jun 2010 05:15:40 +0000
(
01:15
-0400)
committer
Len Brown
<len.brown@intel.com>
Sat, 12 Jun 2010 05:15:40 +0000
(
01:15
-0400)
Conflicts:
drivers/acpi/sleep.c
Signed-off-by: Len Brown <len.brown@intel.com>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff