diff options
| author | Linus Torvalds | 2018-03-05 20:31:14 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2018-03-05 20:31:14 -0800 |
| commit | ce380619fab99036f5e745c7a865b21c59f005f6 (patch) | |
| tree | 04c32364dabb8917c3beeb740357b4c0d0232792 /net/xfrm | |
| parent | 094b58e1040a44f991d7ab628035e69c4d6b79c9 (diff) | |
| parent | 48e362dd96f37d819042f848888b2c6407e01e6d (diff) | |
Merge tag 'please-pull-ia64_misc' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull ia64 cleanups from Tony Luck:
- More atomic cleanup from willy
- Fix a python script to work with version 3
- Some other small cleanups
* tag 'please-pull-ia64_misc' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
ia64/err-inject: fix spelling mistake: "capapbilities" -> "capabilities"
ia64/err-inject: Use get_user_pages_fast()
ia64: doc: tweak whitespace for 'console=' parameter
ia64: Convert remaining atomic operations
ia64: convert unwcheck.py to python3
Diffstat (limited to 'net/xfrm')
0 files changed, 0 insertions, 0 deletions