git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4538fad
0a918a9
)
Merge branch 'dock' into test
author
Len Brown
<len.brown@intel.com>
Thu, 23 Oct 2008 03:25:26 +0000
(23:25 -0400)
committer
Len Brown
<len.brown@intel.com>
Thu, 23 Oct 2008 03:25:26 +0000
(23:25 -0400)
Conflicts:
drivers/acpi/osl.c
Signed-off-by: Len Brown <len.brown@intel.com>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff