]> www.infradead.org Git - linux.git/commitdiff
projects / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 408fb7f cf8df96)
Merge branch 'acpi-lpss' into linux-next
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 8 Apr 2013 10:31:30 +0000 (12:31 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 8 Apr 2013 10:31:30 +0000 (12:31 +0200)
* acpi-lpss:
  ACPI / LPSS: make code less confusing for reader
  ACPI / LPSS: Add support for exposing LTR registers to user space
  ACPI / scan: Add special handler for Intel Lynxpoint LPSS devices

1  2 
drivers/acpi/internal.h patch | diff1 | diff2 | blob | history
drivers/acpi/scan.c patch | diff1 | diff2 | blob | history

diff --cc drivers/acpi/internal.h
Simple merge
diff --cc drivers/acpi/scan.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.