commit 52de84f3f3f407013a7f7872601e7a43a505abd3
author Linus Torvalds <torvalds@linux-foundation.org> Fri Jul 22 16:52:39 2011 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Fri Jul 22 16:52:39 2011 -0700
tree cfd7ac2fd9a928d4855eb90be06d25947f90f1ef
parent 112ec469663e09ffc815761254b52f3ca787ce83
parent ef68c8f87ed13f65df867dddf36c0e185b27b942

Merge branch 'timers-rtc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'timers-rtc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Serialize EFI time accesses on rtc_lock
  x86: Serialize SMP bootup CMOS accesses on rtc_lock
  rtc: stmp3xxx: Remove UIE handlers
  rtc: stmp3xxx: Get rid of mach-specific accessors
  rtc: stmp3xxx: Initialize drvdata before registering device
  rtc: stmp3xxx: Port stmp-functions to mxs-equivalents
  rtc: stmp3xxx: Restore register definitions
  rtc: vt8500: Use define instead of hardcoded value for status bit