projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
26f8784
73577d1
7201379
)
Merge branches 'acpi-tables' and 'acpi-general'
author
Rafael J. Wysocki
<rafael.j.wysocki@intel.com>
Tue, 3 Jun 2014 21:10:06 +0000
(23:10 +0200)
committer
Rafael J. Wysocki
<rafael.j.wysocki@intel.com>
Tue, 3 Jun 2014 21:10:06 +0000
(23:10 +0200)
* acpi-tables:
ACPI: Fix conflict between customized DSDT and DSDT local copy
* acpi-general:
ACPI: Add acpi_bus_attach_private_data() to attach data to ACPI handle
1
2
3
drivers/acpi/bus.c
patch
|
diff1
|
diff2
|
diff3
|
blob
|
history
diff --cc
drivers/acpi/bus.c
Simple merge