Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 28 Nov 2014 02:19:25 +0000 (18:19 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 28 Nov 2014 02:19:25 +0000 (18:19 -0800)
commitae979430e3e2ac23ae44c37077f1171ff5829d7b
tree35e3d21bf313c362285f1863dd2fcd2d8b9f8011
parent8e8459719cd129e6a91ebfcd46f68f8396f8f735
parent0d1d9092b536859a333ee96cff4df0ee24b55190
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.