Skip to content
Commit ab387f0a authored by Herbert Xu's avatar Herbert Xu
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux 

Merge 4.14-rc3 in order to pick up the new timer_setup function.
parents e666d4e9 9e66317d
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment