git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
299cfe3
299cfe3
9e52797
)
Merge branches 'release' and 'fluff' into release
author
Len Brown
<len.brown@intel.com>
Thu, 7 Feb 2008 08:38:22 +0000
(
03:38
-0500)
committer
Len Brown
<len.brown@intel.com>
Thu, 7 Feb 2008 08:38:22 +0000
(
03:38
-0500)
Conflicts:
drivers/acpi/scan.c
include/linux/acpi.h
Signed-off-by: Len Brown <len.brown@intel.com>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff