From: Linus Torvalds Date: Sat, 18 Aug 2007 16:43:40 +0000 (-0700) Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6 X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=56616ebd0e49b7e5c67a19ca1d96e8ec382bcacf;p=openwrt%2Fstaging%2Fblogic.git Merge /pub/scm/linux/kernel/git/lethal/sh64-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6: sh64: arch/sh64/kernel/setup.c: duplicate include removal. sh64: arch/sh64/kernel/signal.c: duplicate include removal sh64: Add missing dma_sync_single_for_*(). --- 56616ebd0e49b7e5c67a19ca1d96e8ec382bcacf