Arnd Bergmann 15db3e823c Merge branch 'drivers/rtc-sa1100' into next/drivers
* 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
2011-12-28 10:46:03 +00:00
..
2011-03-31 11:26:23 -03:00
2011-06-01 19:29:39 -07:00
2011-03-22 17:44:16 -07:00
2011-08-26 17:26:35 -07:00
2011-03-31 11:26:23 -03:00
2011-05-26 17:12:33 -07:00
2011-05-26 17:12:33 -07:00