git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7458bbd
d81c45e
)
Merge branch 'ost' into release
author
Len Brown
<len.brown@intel.com>
Wed, 16 Dec 2009 07:18:36 +0000
(
02:18
-0500)
committer
Len Brown
<len.brown@intel.com>
Wed, 16 Dec 2009 07:18:36 +0000
(
02:18
-0500)
Conflicts:
include/acpi/processor.h
Signed-off-by: Len Brown <len.brown@intel.com>
Trivial merge