diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-11 11:17:54 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-11 11:17:54 -0800 |
| commit | 69973b830859bc6529a7a0468ba0d80ee5117826 (patch) | |
| tree | 5f11fe15ed9d9a3ab9c92242030e54b73ecdce45 /sound/soc/samsung/idma.c | |
| parent | 2e4333c14de06a333783d6812cf3c4998f78b0c8 (diff) | |
Linux 4.9
Diffstat (limited to 'sound/soc/samsung/idma.c')
Merge tag 'rtc-4.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux
Pull RTC fix from Alexandre Belloni:
"A single fix for this cycle. It is worth taking it for 4.10 so that
distributions will not have CONFIG_RTC_DRV_JZ4740 switching from m to
y in their config.
Summary:
- Allow jz4740 to build as a module again by using kernel_halt()"
* tag 'rtc-4.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
rtc: jz4740: make the driver buildable as a module again
Diffstat (limited to 'tools/arch/parisc/include')