summaryrefslogtreecommitdiffstats
path: root/net/netfilter/ipset/ip_set_hash_ip.c
diff options
context:
space:
mode:
authorRafael J. Wysocki2012-12-07 23:14:35 +0100
committerRafael J. Wysocki2012-12-07 23:14:35 +0100
commit1a14f30b36e5d20a2a1be24888c2158541d97bab (patch)
tree790531441ea86f7873d3d2874f33eeb5c1f2e938 /net/netfilter/ipset/ip_set_hash_ip.c
parentMerge branch 'acpi-enumeration' (diff)
parentpnpacpi: fix incorrect TEST_ALPHA() test (diff)
downloadkernel-qcow2-linux-1a14f30b36e5d20a2a1be24888c2158541d97bab.tar.gz
kernel-qcow2-linux-1a14f30b36e5d20a2a1be24888c2158541d97bab.tar.xz
kernel-qcow2-linux-1a14f30b36e5d20a2a1be24888c2158541d97bab.zip
Merge branch 'acpi-general'
* acpi-general: pnpacpi: fix incorrect TEST_ALPHA() test ACPI / video: ignore BIOS initial backlight value for HP Folio 13-2000 ACPI : do not use Lid and Sleep button for S5 wakeup
Diffstat (limited to 'net/netfilter/ipset/ip_set_hash_ip.c')
0 files changed, 0 insertions, 0 deletions