diff options
author | 2013-01-23 13:31:15 -0800 | |
---|---|---|
committer | 2013-01-23 13:31:15 -0800 | |
commit | 248152b60209874b1707a23d336b137486756a29 (patch) | |
tree | 74375313bfe60dc0866501a0e1c4addc67720141 /tools/perf/scripts/python/export-to-postgresql.py | |
parent | Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64 (diff) | |
parent | m68k: Wire up finit_module (diff) | |
download | linux-dev-248152b60209874b1707a23d336b137486756a29.tar.xz linux-dev-248152b60209874b1707a23d336b137486756a29.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k fixes from Geert Uytterhoeven:
"The asm-generic changeset has been ack'ed by Arnd."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: Wire up finit_module
asm-generic/dma-mapping-broken.h: Provide dma_alloc_attrs()/dma_free_attrs()
m68k: Provide dma_alloc_attrs()/dma_free_attrs()
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions