| commit | 303c146df1c4574db3495d9acc5c440dd46c6b0f | [log] [tgz] |
|---|---|---|
| author | Thomas Gleixner <tglx@linutronix.de> | Sat Jan 27 15:35:29 2018 +0100 |
| committer | Thomas Gleixner <tglx@linutronix.de> | Sat Jan 27 15:35:29 2018 +0100 |
| tree | fbcea289aea24da8a44c7677a776988bb3c8bcbe | |
| parent | b1a31a5f5f27ff8aba42b545a1c721941f735107 [diff] | |
| parent | d5421ea43d30701e03cadc56a38854c36a8b4433 [diff] |
Merge branch 'timers/urgent' into timers/core Pick up urgent bug fix and resolve the conflict. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>