git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b620283
747479a
)
Merge branch 'dock' into release
author
Len Brown
<len.brown@intel.com>
Wed, 16 Dec 2009 08:33:28 +0000
(
03:33
-0500)
committer
Len Brown
<len.brown@intel.com>
Wed, 16 Dec 2009 08:33:28 +0000
(
03:33
-0500)
Conflicts:
drivers/acpi/dock.c
Signed-off-by: Len Brown <len.brown@intel.com>
Trivial merge