| commit | 751321b3dd5040dc5be19bd23f985e80c914621a | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jan 30 13:18:12 2017 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jan 30 13:18:12 2017 -0800 |
| tree | 967928e24b38dc7fed918f932bb1b243af42bf7f | |
| parent | 566cf877a1fcb6d6dc0126b076aad062054c2637 [diff] | |
| parent | 586655d278ba08af7b198b93217746f9a506ee8a [diff] |
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