Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 3 Nov 2007 19:41:58 +0000 (12:41 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 3 Nov 2007 19:41:58 +0000 (12:41 -0700)
commit21806261b6cc1068197ea6c8891b857f16260fee
tree79f9e6c27691a0c0b75f3639f85e4ba2babf6726
parent5c27d0f11e679e6e5b6b2047b8658409699d4a67
parentdd3aa7cdac35dcdcb93ff5684622664395b0155e
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.