summaryrefslogtreecommitdiffstats
path: root/include/asm-um
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-03-21 07:56:58 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-03-21 07:56:58 -0700
commit2c7871982cf27caaddbaeb7e2121ce1374b520ff (patch)
treeb3257b5f532bbd152342a3fea08d18a744e65f85 /include/asm-um
parent49ccf74aaf6b53751dc0ae06ded9bb39343da822 (diff)
parent49a5ba46c5d1e34bcb07634157b29d7414ce13bd (diff)
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.
Diffstat (limited to 'include/asm-um')
0 files changed, 0 insertions, 0 deletions