From: Linus Torvalds Date: Sat, 20 Mar 2010 01:16:20 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e4d806377b069881f930089bf880918d3ad555ab;p=openwrt%2Fstaging%2Fblogic.git Merge git://git./linux/kernel/git/lethal/sh-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: serial: sh-sci: remove duplicated #include sh: Export uncached helper symbols. sh: Fix up NUMA build for 29-bit. serial: sh-sci: Fix build failure for non-sh architectures. sh: Fix up uncached offset for legacy 29-bit mode. sh: Support CPU affinity masks for INTC controllers. --- e4d806377b069881f930089bf880918d3ad555ab