OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f6f94e2
8df3fc9
)
Merge branch 'acpica' into release
author
Len Brown
<len.brown@intel.com>
Mon, 25 Oct 2010 06:10:36 +0000
(
02:10
-0400)
committer
Len Brown
<len.brown@intel.com>
Mon, 25 Oct 2010 06:10:36 +0000
(
02:10
-0400)
Conflicts:
drivers/acpi/acpica/aclocal.h
Signed-off-by: Len Brown <len.brown@intel.com>
1
2
include/acpi/acpixf.h
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
include/acpi/acpixf.h
Simple merge