diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-13 12:15:40 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-13 12:15:40 -0800 |
| commit | f08d8bcc12de5a153e587027e77de83662eefb8a (patch) | |
| tree | 301fedc4a3ba056db2699b471f4cb69edc2151d3 /net/wireless/nl80211.c | |
| parent | f3573b8f902c507c721999cc669fbb7e045081b8 (diff) | |
| parent | d4d1fc61eb38ff8e5af657e2d2f2290859a277f2 (diff) | |
Merge tag 'please-pull-gettime_vsyscall_update' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull ia64 update from Tony Luck:
"Stop ia64 being the last holdout using GENERIC_TIME_VSYSCALL_OLD so
that John Stultz can drop that code"
* tag 'please-pull-gettime_vsyscall_update' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
ia64: Update fsyscall gettime to use modern vsyscall_update
Diffstat (limited to 'net/wireless/nl80211.c')
0 files changed, 0 insertions, 0 deletions