]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 13 Jun 2011 17:47:04 +0000 (10:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 13 Jun 2011 17:47:04 +0000 (10:47 -0700)
commit8a14430727ed20f3abd0f8e143ef50e4ffeb3226
tree65a5d75b5e73fea871d335c9fbcb9decbeb0a880
parentfd00db0edf92287af54d0e7fff3d323ed99dfb96
parent1e0a479e7fb65fb2839a7099a07aef986bec8615
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