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)
* '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)

1  2 
arch/arm/mach-omap2/pm24xx.c

Simple merge