diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-12-28 11:46:03 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-28 11:46:03 +0100 |
| commit | 15db3e823c3246e3bd31fe454f5c8927eb85caf2 (patch) | |
| tree | f91811c5872ede20ec86f4256a9f60befa6b8a61 /arch/arm/mach-omap2/board-omap3logic.c | |
| parent | Merge branch 'drivers/pxa-gpio' into next/drivers (diff) | |
| parent | ARM: sa1100: clean up of the clock support (diff) | |
| download | linux-15db3e823c3246e3bd31fe454f5c8927eb85caf2.tar.xz linux-15db3e823c3246e3bd31fe454f5c8927eb85caf2.zip | |
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
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3logic.c')
0 files changed, 0 insertions, 0 deletions