summaryrefslogtreecommitdiff
path: root/net/ieee802154/core.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ieee802154/core.c')
0 files changed, 0 insertions, 0 deletions
-0800 committerLinus Torvalds <torvalds@linux-foundation.org>2016-12-11 10:17:39 -0800 commit2e4333c14de06a333783d6812cf3c4998f78b0c8 (patch) tree368428514d70f34f2261c7f954f241f886d6bb51 /net/sched/em_u32.c parent045169816b31b10faed984b01c390db1b32ee4c1 (diff)parentba735155b9647b6167fd50276ca0fbfbce4e836c (diff)
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 'net/sched/em_u32.c')