summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-03-20 02:16:20 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-20 02:16:20 +0100
commite4d806377b069881f930089bf880918d3ad555ab (patch)
treeed03416ddaa770bed16880ffea32b9b71dd5c7c7 /Makefile
parentMerge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff)
parentserial: sh-sci: remove duplicated #include (diff)
downloadlinux-e4d806377b069881f930089bf880918d3ad555ab.tar.xz
linux-e4d806377b069881f930089bf880918d3ad555ab.zip
Merge git://git.kernel.org/pub/scm/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.
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions