git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4895ae6
4a3cba5
)
Merge branch 'acpi-mmio' into release
author
Len Brown
<len.brown@intel.com>
Tue, 26 Oct 2010 18:50:56 +0000
(14:50 -0400)
committer
Len Brown
<len.brown@intel.com>
Tue, 26 Oct 2010 18:50:56 +0000
(14:50 -0400)
Conflicts:
drivers/acpi/osl.c
Signed-off-by: Len Brown <len.brown@intel.com>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff