| commit | e4d806377b069881f930089bf880918d3ad555ab | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Mar 19 18:16:20 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Mar 19 18:16:20 2010 -0700 |
| tree | ed03416ddaa770bed16880ffea32b9b71dd5c7c7 | |
| parent | b50df7d1fb37eb6aea87590b391d7111fde87121 [diff] | |
| parent | 3f7581d66ece6b7ff643c8c817bfbd72cdbe9077 [diff] |
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.