From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 3 Apr 2009 16:51:35 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/rtc-parisc
X-Git-Tag: Ubuntu-5.2.0-15.16~30069
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=bad6a5c08c119572c888d5df2bd7691a4da6b9e8;p=mirror_ubuntu-eoan-kernel.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/rtc-parisc

* git://git.kernel.org/pub/scm/linux/kernel/git/kyle/rtc-parisc:
  powerpc/ps3: Add rtc-ps3
  powerpc: Hook up rtc-generic, and kill rtc-ppc
  m68k: Hook up rtc-generic
  parisc: rtc: Rename rtc-parisc to rtc-generic
  parisc: rtc: Add missing module alias
  parisc: rtc: platform_driver_probe() fixups
  parisc: rtc: get_rtc_time() returns unsigned int
---

bad6a5c08c119572c888d5df2bd7691a4da6b9e8