Merge branch 'drivers/rtc-sa1100' into next/drivers
authorArnd Bergmann <arnd@arndb.de>
Wed, 28 Dec 2011 10:46:03 +0000 (10:46 +0000)
committerArnd Bergmann <arnd@arndb.de>
Wed, 28 Dec 2011 10:46:03 +0000 (10:46 +0000)
commit15db3e823c3246e3bd31fe454f5c8927eb85caf2
treef91811c5872ede20ec86f4256a9f60befa6b8a61
parentd7bd1b8a6104bcdc53611689fec8715a236a22c8
parentedf3ff5bac2582b57de4e7c6569fee5d7c1c0a42
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
arch/arm/Kconfig
arch/arm/mach-pxa/devices.c
arch/arm/mach-pxa/pxa25x.c
arch/arm/mach-pxa/pxa27x.c
arch/arm/mach-pxa/pxa3xx.c
arch/arm/mach-pxa/pxa95x.c