diff options
author | Rafael J. Wysocki | 2012-12-07 23:14:25 +0100 |
---|---|---|
committer | Rafael J. Wysocki | 2012-12-07 23:14:25 +0100 |
commit | 583bdc59820692eead7868e816d08bee4c55c1c6 (patch) | |
tree | d9aaa6d76f171aa3f92ec6ae01f0caa29710c623 /net/netfilter/ipset/ip_set_hash_ip.c | |
parent | Merge branch 'acpi-dev-pm' (diff) | |
parent | ACPI: add Haswell LPSS devices to acpi_platform_device_ids list (diff) | |
download | kernel-qcow2-linux-583bdc59820692eead7868e816d08bee4c55c1c6.tar.gz kernel-qcow2-linux-583bdc59820692eead7868e816d08bee4c55c1c6.tar.xz kernel-qcow2-linux-583bdc59820692eead7868e816d08bee4c55c1c6.zip |
Merge branch 'acpi-enumeration'
* acpi-enumeration:
ACPI: add Haswell LPSS devices to acpi_platform_device_ids list
ACPI: add documentation about ACPI 5 enumeration
Diffstat (limited to 'net/netfilter/ipset/ip_set_hash_ip.c')
0 files changed, 0 insertions, 0 deletions