tree 67d43adab2afd18a74d08f347e3676ae1a64193f
parent a3a3c4664184f86ef964323d106c62158e2b3f25
parent 1d8c38c3d1b48eeb9cfaa42a8be13a1423569eb2
author Arnd Bergmann <arnd@arndb.de> 1330432796 +0000
committer Arnd Bergmann <arnd@arndb.de> 1330432801 +0000

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)