]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit09a081cc87186e59d79a6c755868e4586bbc99b7
treef91811c5872ede20ec86f4256a9f60befa6b8a61
parentc951e7dd48ae6efed30fed8cb81eb4006af09574
parentc8765b530f55f2c009aef6f42e3f5b08239226b5
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