From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 28 Dec 2011 10:46:03 +0000 (+0000)
Subject: Merge branch 'drivers/rtc-sa1100' into next/drivers
X-Git-Tag: firefly_0821_release~3680^2~3790^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=15db3e823c3246e3bd31fe454f5c8927eb85caf2;p=firefly-linux-kernel-4.4.55.git

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
---

15db3e823c3246e3bd31fe454f5c8927eb85caf2