projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c78a9b9 f6509b5)
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)
commit80dadf86d607bc5f25cc384ac590ef8b49ae523a
tree65a5d75b5e73fea871d335c9fbcb9decbeb0a880tree | snapshot
parentc78a9b9b8e36b8de302eddbe7a1688af3d9650ffcommit | diff
parentf6509b5f002a69c299b04d32a876d051a0b52f68commit | diff
Merge branch 'timers-urgent-for-linus' of git://git./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
John Crispins staging tree