From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 28 Nov 2014 02:19:25 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
X-Git-Tag: v3.18-rc7~14
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ae979430e3e2ac23ae44c37077f1171ff5829d7b;p=profile%2Fcommon%2Fplatform%2Fkernel%2Flinux-artik7.git

Merge git://git./linux/kernel/git/davem/sparc

Pull sparc fixlet from David Miller:
 "Aparc fix to add dma_cache_sync(), even if a nop it should be provided
  if dma_{alloc,free}_noncoherent() is provided too"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc: Add NOP dma_cache_sync() implementation.
---

ae979430e3e2ac23ae44c37077f1171ff5829d7b