From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 28 Jun 2013 11:00:45 +0000 (+0200)
Subject: Merge branch 'acpi-doc'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e8b6cb3947430d62538d88f615c007a51aeb23fe;p=linux.git

Merge branch 'acpi-doc'

* acpi-doc:
  Documentation / CPU hotplug: Rephrase the outdated description for MADT entries
  ACPI / video: update video_extension.txt for backlight control
  ACPI / video: move video_extension.txt to Documentation/acpi
  ACPI / video: add description for brightness_switch_enabled
  ACPI: Add ACPI namespace documentation
  ACPI: Add sysfs ABI documentation
  ACPI: Update MAINTAINERS file to include Documentation/acpi
---

e8b6cb3947430d62538d88f615c007a51aeb23fe