diff options
| author | Linus Torvalds | 2011-06-13 10:47:04 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2011-06-13 10:47:04 -0700 |
| commit | 80dadf86d607bc5f25cc384ac590ef8b49ae523a (patch) | |
| tree | 65a5d75b5e73fea871d335c9fbcb9decbeb0a880 /scripts/setlocalversion | |
| parent | c78a9b9b8e36b8de302eddbe7a1688af3d9650ff (diff) | |
| parent | f6509b5f002a69c299b04d32a876d051a0b52f68 (diff) | |
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
Diffstat (limited to 'scripts/setlocalversion')
0 files changed, 0 insertions, 0 deletions