diff options
| author | Linus Torvalds <[email protected]> | 2018-08-13 09:50:24 -0700 | 
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2018-08-13 09:50:24 -0700 | 
| commit | 03e61914a6d2c5bb95faaa470193cfdb71b7ea01 (patch) | |
| tree | 3fdc3adc7cb0d559fbdbba6c91cba24681f73a8b /tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Util.py | |
| parent | 94710cac0ef4ee177a63b5227664b38c95bbf703 (diff) | |
| parent | 71a896687b851477bfe2e7022cd4b597ab4f900d (diff) | |
Merge tag 'm68k-for-v4.19-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven:
 - Enable mac_scsi PDMA on PowerBook 500
 - Generic dma_noncoherent_ops conversion
 - Time handling improvements
 - I/O accessor improvements
 - Conversion to MEMBLOCK and NO_BOOTMEM, to bring m68k in line with
   other mainstream architectures
 - Miscellaneous fixes and cleanups
 - Defconfig updates
* tag 'm68k-for-v4.19-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k/defconfig: Update defconfigs for v4.18-rc6
  m68k: switch to MEMBLOCK + NO_BOOTMEM
  m68k/page_no.h: force __va argument to be unsigned long
  m68k/bitops: convert __ffs to match generic declaration
  m68k/io: Switch mmu variant to <asm-generic/io.h>
  m68k/io: Move mem*io define guards to <asm/kmap.h>
  Input: hilkbd - Add casts to HP9000/300 I/O accessors
  net: mac8390: Use standard memcpy_{from,to}io()
  m68k/io: Add missing ioremap define guards, fix typo
  m68k: Remove unused set_clock_mmss() helpers
  m68k: mac: Use time64_t in RTC handling
  m68k: Use generic dma_noncoherent_ops
  nubus: Set default dma mask for nubus_board devices
  m68k/mac: Enable PDMA for PowerBook 500 series
Diffstat (limited to 'tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Util.py')
0 files changed, 0 insertions, 0 deletions