| commit | 626f380d0b264a1e40237f5a2a3dffc5d14f256e | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jun 23 11:52:16 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jun 23 11:52:16 2009 -0700 |
| tree | 456889d94d219628c225ccef3ad4f2af0475cbf4 | |
| parent | 32708e8e95265505d9627b3bc9ed16566e0dca1c [diff] | |
| parent | bb38c222e07cbe252cfbd99cd6a9c834b0a2639a [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: sh: Fix up HAVE_PERF_COUNTERS typo. sh: Fix up more dma-mapping fallout. sh: SH7786 SMP support. sh: Wire up the uncached fixmap on sh64 as well. sh: Use local TLB flush in set_pte_phys(). sh: Provide cpu_idle_wait() to fix up cpuidle/SMP build.