diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-09-18 23:07:46 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-09-18 23:07:46 +0200 |
| commit | 0f40314b81b765c26202cde33523e35809adbe9b (patch) | |
| tree | 34cbbf71b39f88edddb8693f0a61427f305b17fa /net/ethernet | |
| parent | 7dc1d36e8ef8f78f9dadf0476081f3c7ff7f79be (diff) | |
| parent | bcb2b0b2bae2de744223c68521cd51c57feb486c (diff) | |
Merge branch 'acpi-bus'
* acpi-bus:
ACPI: Eliminate CONFIG_.*{, _MODULE} #ifdef in favor of IS_ENABLED()
ACPI: int340x_thermal: add missing CONFIG_ prefix
Diffstat (limited to 'net/ethernet')
0 files changed, 0 insertions, 0 deletions