]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 76966c7 75e01fd)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 Jan 2013 21:31:15 +0000 (13:31 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 Jan 2013 21:31:15 +0000 (13:31 -0800)
commit7cc8e3eff42dcf286c44f4f588019028f5577a23
tree74375313bfe60dc0866501a0e1c4addc67720141tree | snapshot
parent76966c7950bfc248ad323309b974da53df638b73commit | diff
parent75e01fd8d083c78ec0a8b9562af3e1591cbc36cfcommit | 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()
Linux Kernel Source Tree.