From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 23 Jan 2013 21:31:15 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux... 
X-Git-Tag: v3.8-rc5~14
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=248152b60209874b1707a23d336b137486756a29;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branch 'for-linus' of git://git./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()
---

248152b60209874b1707a23d336b137486756a29