summaryrefslogtreecommitdiff
path: root/include/net/inet_common.h
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-12-12 12:17:31 +0000
committerMark Brown <broonie@kernel.org>2016-12-12 12:17:31 +0000
commitd00b74613fb18dfd0a5aa99270ee2e72d5c808d7 (patch)
treea4a76197dc9cc07a9b64c3834bfc4f139f6447ef /include/net/inet_common.h
parent56e3d92ddb97d9584622b29d4ecb268e30242b1e (diff)
parentf8192880a102849d84fe0f5e27bc8625a33e031c (diff)
parent3498c5e15db3af90aee7dbe9a0910225422b85c1 (diff)
Merge remote-tracking branches 'regulator/topic/tps65086' and 'regulator/topic/twl' into regulator-next
td>
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS fixes from Ralf Baechle: "Two more MIPS fixes for 4.9: - RTC: Return -ENODEV so an external RTC will be tried - Fix mask of GPE frequency These two have been tested on Imagination's automated test system and also both received positive reviews on the linux-mips mailing list" * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: MIPS: Lantiq: Fix mask of GPE frequency MIPS: Return -ENODEV from weak implementation of rtc_mips_set_time
Diffstat (limited to 'tools/laptop/freefall/freefall.c')