From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 13 Jun 2011 17:47:04 +0000 (-0700)
Subject: Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.0-rc3~3
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/80dadf86d607bc5f25cc384ac590ef8b49ae523a

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

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  rtc: Staticize non-exported __rtc_set_alarm()
  rtc: Fix ioctl error path return
  ptp: Fix some locking bugs in ptp_read()
  ptp: Return -EFAULT on copy_to_user() errors
---

80dadf86d607bc5f25cc384ac590ef8b49ae523a