summaryrefslogtreecommitdiff
path: root/include/net/irda/irmod.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/net/irda/irmod.h')
0 files changed, 0 insertions, 0 deletions
-next.git/tree/?id=cc9b94029e9ef51787af908e9856b1eed314bc00'>9675310b89d0f6fb1f7bd9423f0638c4ee5226fd /sound/pci/ctxfi parent13bed58ce8748d430a26e353a09b89f9d613a71f (diff)parent1b5b42216469b05ef4b5916cb40b127dfab1da88 (diff)
Merge branch 'topic/error' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-fixed
Diffstat (limited to 'sound/pci/ctxfi')
pstream-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 'sound/soc/samsung/Makefile')