diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-29 13:56:05 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-29 13:56:05 +0100 |
| commit | 8a78cf70fae587b0691b4b982bc69c1261e05e76 (patch) | |
| tree | c2b3aa89d4b64c7207250fb9ddff8fc5d717d486 /drivers/zorro/proc.c | |
| parent | 09212fddc8661e67a964d91a6584209784f52500 (diff) | |
| parent | 65ab96f60621c4da8f1b4087a57b788bc4d8f27b (diff) | |
Merge branch 'acpi-pm' into acpi-cleanup
The following commits depend on the 'acpi-pm' material.
Diffstat (limited to 'drivers/zorro/proc.c')
0 files changed, 0 insertions, 0 deletions