Merge tag 'v3.18-rc4' into x86/cleanups, to refresh the tree before pulling new changes.
[cascardo/linux.git] / Documentation / networking / timestamping / .gitignore
1 timestamping
2 txtimestamp
3 hwtstamp_config