Merge branch 'cleanup-3.4' of git://github.com/hzhuang1/linux into next/cleanup
authorArnd Bergmann <arnd@arndb.de>
Tue, 28 Feb 2012 12:39:56 +0000 (12:39 +0000)
committerArnd Bergmann <arnd@arndb.de>
Tue, 28 Feb 2012 12:40:01 +0000 (12:40 +0000)
commit4d8cfec692e988b844dcaeaeb76b5780b7ef9d28
tree67d43adab2afd18a74d08f347e3676ae1a64193f
parenta3a3c4664184f86ef964323d106c62158e2b3f25
parent1d8c38c3d1b48eeb9cfaa42a8be13a1423569eb2
Merge branch 'cleanup-3.4' of git://github.com/hzhuang1/linux into next/cleanup

* 'cleanup-3.4' of git://github.com/hzhuang1/linux: (2 commits)
  rtc: sa1100: remove verification code of alarm
  rtc: sa1100: remove periodic code

(update to v3.3-rc5)
arch/arm/mach-omap2/pm24xx.c