summaryrefslogtreecommitdiff
path: root/include/net/atmclip.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/net/atmclip.h')
0 files changed, 0 insertions, 0 deletions
olspan='2' class='oid'>368428514d70f34f2261c7f954f241f886d6bb51 /net/sched/sch_generic.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/sch_generic.c')