From: Linus Torvalds Date: Fri, 21 Mar 2008 14:56:58 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.25 X-Git-Tag: Ubuntu-5.10.0-12.13~40622 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=2c7871982cf27caaddbaeb7e2121ce1374b520ff;p=mirror_ubuntu-hirsute-kernel.git Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.25 * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.25: sh: Use relative paths for mach/cpu symlinks. SH: Use newer, non-deprecated __SPIN_LOCK_UNLOCKED macro. sh: Fix more user header breakage from sh64 integration. sh: Fix uImage build error. sh: Fix up the timer IRQ definition for SH7203. sh: Fix up the address error exception handler for SH-2. serial: sh-sci: Fix fifo stall on SH7760/SH7780/SH7785 SCIF. --- 2c7871982cf27caaddbaeb7e2121ce1374b520ff