diff options
| author | Linus Torvalds <[email protected]> | 2014-06-05 23:15:33 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2014-06-05 23:15:33 +0000 |
| commit | 2b03adc1911d1c84cb7fad8b424234f589547cb3 (patch) | |
| tree | ca817632d166046bbfe917894afd99c698d47627 /tools/perf/scripts/python/check-perf-trace.py | |
| parent | Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into next (diff) | |
| parent | microblaze: Fix typo in head.S s/substract/subtract/ (diff) | |
| download | kernel-2b03adc1911d1c84cb7fad8b424234f589547cb3.tar.gz kernel-2b03adc1911d1c84cb7fad8b424234f589547cb3.zip | |
Merge tag 'microblaze-3.16-rc1' of git://git.monstr.eu/linux-2.6-microblaze into next
Pull Microblaze updates from Michal Simek:
- cleanup PCI and DMA handling
- use generic device.h
- some cleanups
* tag 'microblaze-3.16-rc1' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: Fix typo in head.S s/substract/subtract/
microblaze: remove check for CONFIG_XILINX_CONSOLE
microblaze: Use generic device.h
microblaze: Do not setup empty unmap_sg function
microblaze: Remove device_to_mask
microblaze: Clean device dma_ops structure
microblaze: Cleanup PCI_DRAM_OFFSET handling
microblaze: Do not setup pci_dma_ops
microblaze: Return default dma operations
microblaze: Enable SERIAL_OF_PLATFORM
Diffstat (limited to 'tools/perf/scripts/python/check-perf-trace.py')
0 files changed, 0 insertions, 0 deletions