summaryrefslogtreecommitdiff
path: root/sound/spi
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-01-22 12:54:15 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2017-01-22 12:54:15 -0800
commit7a308bb3016f57e5be11a677d15b821536419d36 (patch)
treefe38c83c49dfd568b540666948ef78cb9d082c38 /sound/spi
parent095cbe66973771fecd8e8b1e8763181363ef703e (diff)
Linux 4.10-rc5
Diffstat (limited to 'sound/spi')
0 files changed, 0 insertions, 0 deletions
36c'>ba735155b9647b6167fd50276ca0fbfbce4e836c (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 'sound/soc/codecs/pcm512x.h')