| commit | 15db3e823c3246e3bd31fe454f5c8927eb85caf2 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Wed Dec 28 10:46:03 2011 +0000 |
| committer | Arnd Bergmann <arnd@arndb.de> | Wed Dec 28 10:46:03 2011 +0000 |
| tree | f91811c5872ede20ec86f4256a9f60befa6b8a61 | |
| parent | d7bd1b8a6104bcdc53611689fec8715a236a22c8 [diff] | |
| parent | edf3ff5bac2582b57de4e7c6569fee5d7c1c0a42 [diff] |
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