| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Wed, 23 Jan 2013 21:31:15 +0000 (13:31 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Wed, 23 Jan 2013 21:31:15 +0000 (13:31 -0800) | ||
| commit | 248152b60209874b1707a23d336b137486756a29 | |
| tree | 74375313bfe60dc0866501a0e1c4addc67720141 | tree | snapshot (tar.xz tar.gz zip) |
| parent | c1b84144c2123f274d2613369d83fc5c05d54ffa | commit | diff |
| parent | e7e29b4cf3c4f2acb2433c45b29d1c7881321d36 | commit | diff |
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()
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()