git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e5e54bc
e5e54bc
3c60284
)
Merge branches 'release' and 'menlo' into release
author
Len Brown
<len.brown@intel.com>
Thu, 7 Feb 2008 08:18:04 +0000
(
03:18
-0500)
committer
Len Brown
<len.brown@intel.com>
Thu, 7 Feb 2008 08:18:04 +0000
(
03:18
-0500)
Conflicts:
drivers/acpi/video.c
Signed-off-by: Len Brown <len.brown@intel.com>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff