summaryrefslogtreecommitdiffstats
path: root/net/openvswitch/conntrack.c
diff options
context:
space:
mode:
authorLinus Torvalds2016-04-22 00:41:13 +0200
committerLinus Torvalds2016-04-22 00:41:13 +0200
commit5f44abd041c5f3be76d57579ab254d78e601315b (patch)
tree92aa05cfb8f13c15d0732f22778fdad983e6b6c6 /net/openvswitch/conntrack.c
parentMerge tag 'pm+acpi-4.6-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff)
parentrtc: ds1307: Use irq when available for wakeup-source device (diff)
downloadkernel-qcow2-linux-5f44abd041c5f3be76d57579ab254d78e601315b.tar.gz
kernel-qcow2-linux-5f44abd041c5f3be76d57579ab254d78e601315b.tar.xz
kernel-qcow2-linux-5f44abd041c5f3be76d57579ab254d78e601315b.zip
Merge tag 'rtc-4.6-3' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux
Pull RTC fixes from Alexandre Belloni: "A few fixes for the RTC subsystem. The documentation fix already missed 4.5 so I think it is worth taking it now: A documentation fix for s3c and two fixes for the ds1307" * tag 'rtc-4.6-3' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: rtc: ds1307: Use irq when available for wakeup-source device rtc: ds1307: ds3231 temperature s16 overflow rtc: s3c: Document in binding that only s3c6410 needs a src clk
Diffstat (limited to 'net/openvswitch/conntrack.c')
0 files changed, 0 insertions, 0 deletions