aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-exynos/Makefile
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-12-28 10:46:03 +0000
committerArnd Bergmann <arnd@arndb.de>2011-12-28 10:46:03 +0000
commit15db3e823c3246e3bd31fe454f5c8927eb85caf2 (patch)
treef91811c5872ede20ec86f4256a9f60befa6b8a61 /arch/arm/mach-exynos/Makefile
parentd7bd1b8a6104bcdc53611689fec8715a236a22c8 (diff)
parentedf3ff5bac2582b57de4e7c6569fee5d7c1c0a42 (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
Diffstat (limited to 'arch/arm/mach-exynos/Makefile')
0 files changed, 0 insertions, 0 deletions