Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/rtc-parisc
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Apr 2009 16:51:35 +0000 (09:51 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Apr 2009 16:51:35 +0000 (09:51 -0700)
commitbad6a5c08c119572c888d5df2bd7691a4da6b9e8
tree7070d6c17659332caad8f3d8f38b51855b3f05c4
parent03c3fa0a3bf48dcb024263a9ea41daecacbc6efa
parent0b5f037a4dc495f9c40eed7f076fc6c23af3359b
Merge git://git./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
drivers/rtc/Kconfig