Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 20 Mar 2010 01:16:20 +0000 (18:16 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 20 Mar 2010 01:16:20 +0000 (18:16 -0700)
* 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.

1  2 
drivers/sh/intc.c

Simple merge