git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3834f47
78f28b7
)
Merge branch 'linus' into sfi-release
author
Len Brown
<len.brown@intel.com>
Sat, 19 Sep 2009 04:11:26 +0000
(
00:11
-0400)
committer
Len Brown
<len.brown@intel.com>
Sat, 19 Sep 2009 04:11:26 +0000
(
00:11
-0400)
Conflicts:
arch/x86/kernel/setup.c
drivers/acpi/power.c
init/main.c
Signed-off-by: Len Brown <len.brown@intel.com>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff