tree 7070d6c17659332caad8f3d8f38b51855b3f05c4
parent 03c3fa0a3bf48dcb024263a9ea41daecacbc6efa
parent 0b5f037a4dc495f9c40eed7f076fc6c23af3359b
author Linus Torvalds <torvalds@linux-foundation.org> 1238777495 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1238777495 -0700

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