From: Linus Torvalds Date: Thu, 15 Feb 2007 18:01:15 +0000 (-0800) Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6 X-Git-Tag: v2.6.21-rc1~179 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f99c6bb6e2e9c35bd3dc0b1d0faa28bd6970930d;p=linux-2.6-omap-h63xx.git Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6: (35 commits) sh: rts7751r2d board updates. sh: Kill off dead bigsur and ec3104 boards. sh: Fixup r7780rp pata_platform for devres conversion. sh: Revert TLB miss fast-path changes that broke PTEA parts. sh: Compile fix for heartbeat consolidation. sh: heartbeat consolidation for banked LEDs. sh: define dma noncoherent API functions. sh: Missing flush_dcache_all() proto in cacheflush.h. sh: Kill dead/unused ISA code from __ioremap(). sh: Add cpu-features header to asm/Kbuild. sh: Move __KERNEL__ up in asm/page.h. sh: Fix syscall numbering breakage. sh: dcache write-back for R7780RP PIO. sh: Switch to local TLB flush variants in additional callsites. sh: Local TLB flushing variants for SMP prep. sh: Fixup cpu_data references for the non-boot CPUs. sh: Use a per-cpu ASID cache. sh: add SH_CLK_MD Kconfig default. sh: Fixup SHMIN INTC register definitions. sh: SH-DMAC compile fixes ... --- f99c6bb6e2e9c35bd3dc0b1d0faa28bd6970930d