From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sat, 3 Nov 2007 19:41:58 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6
X-Git-Tag: MMI-PSA29.97-13-9~38505
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=21806261b6cc1068197ea6c8891b857f16260fee;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge /pub/scm/linux/kernel/git/lethal/sh64-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6:
  sh64: Update defconfigs.
  sh64: fix dma_cache_sync() compilation
  sh64: Move DMA macros from pci.h to scatterlist.h.
---

21806261b6cc1068197ea6c8891b857f16260fee