diff options
| author | Thomas Gleixner <[email protected]> | 2018-01-27 14:35:29 +0000 |
|---|---|---|
| committer | Thomas Gleixner <[email protected]> | 2018-01-27 14:35:29 +0000 |
| commit | 303c146df1c4574db3495d9acc5c440dd46c6b0f (patch) | |
| tree | fbcea289aea24da8a44c7677a776988bb3c8bcbe /net/unix/af_unix.c | |
| parent | usb/gadget/NCM: Replace tasklet with softirq hrtimer (diff) | |
| parent | hrtimer: Reset hrtimer cpu base proper on CPU hotplug (diff) | |
| download | kernel-303c146df1c4574db3495d9acc5c440dd46c6b0f.tar.gz kernel-303c146df1c4574db3495d9acc5c440dd46c6b0f.zip | |
Merge branch 'timers/urgent' into timers/core
Pick up urgent bug fix and resolve the conflict.
Signed-off-by: Thomas Gleixner <[email protected]>
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions