• Arnd Bergmann's avatar
    Merge branch 'drivers/rtc-sa1100' into next/drivers · 15db3e82
    Arnd Bergmann authored
    * drivers/rtc-sa1100:
      ARM: sa1100: clean up of the clock support
      ARM: pxa: add dummy clock for sa1100-rtc
      RTC: sa1100: support sa1100, pxa and mmp soc families
      RTC: sa1100: remove redundant code of setting alarm
      RTC: sa1100: Clean out ost register
    
    Conflicts:
    	arch/arm/mach-pxa/pxa25x.c
    	arch/arm/mach-pxa/pxa27x.c
    15db3e82
pxa95x.c 8.09 KB