From: Linus Torvalds <torvalds@linux-foundation.org>
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-Tag: v2.6.34-rc2~1
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=e4d806377b069881f930089bf880918d3ad555ab;p=safe%2Fjmp%2Flinux-2.6

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