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

1 files changed, 1 insertions, 0 deletions

diff --git a/AUTHORS b/AUTHORS
index 331f42f..849fc10 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -37,6 +37,7 @@ Minor contributors (<= 30 commits):
  * Jon Schipp <jonschipp@gmail.com>
  * Sibir Chakraborty <sibir.chakraborty@gmail.com>
  * Christian Wiese <chris@opensde.org>
+ * Oliver Smith <oliver@zerolag.com>
 
 Special thanks to some of our sponsors: