commit | bad6a5c08c119572c888d5df2bd7691a4da6b9e8 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Apr 03 09:51:35 2009 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Apr 03 09:51:35 2009 -0700 |
tree | 7070d6c17659332caad8f3d8f38b51855b3f05c4 | |
parent | 03c3fa0a3bf48dcb024263a9ea41daecacbc6efa [diff] | |
parent | 0b5f037a4dc495f9c40eed7f076fc6c23af3359b [diff] |
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