summaryrefslogtreecommitdiff
path: root/include/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2010-10-26 22:50:56 +0400
committerLen Brown <len.brown@intel.com>2010-10-26 22:50:56 +0400
commit1bd64d42abdd4f9d44f77011a31f0292112f4c3b (patch)
tree6eae9454b9a30813b75cfa55680b7fc13a5e110c /include/acpi
parent4895ae6f9f81011bf3a6fea70d46bab08d58fd8c (diff)
parent4a3cba5e72a5232842ff7c1ca691ec3450af64b9 (diff)
downloadlinux-1bd64d42abdd4f9d44f77011a31f0292112f4c3b.tar.xz
Merge branch 'acpi-mmio' into release
Conflicts: drivers/acpi/osl.c Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/acpi')
0 files changed, 0 insertions, 0 deletions