git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d7bd1b8 edf3ff5)
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)
* 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


Trivial merge
Pandora Kernel Repository