From: Linus Torvalds Date: Thu, 15 May 2008 16:09:43 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6 X-Git-Tag: v2.6.26-rc3~32 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=713c0515a555952d53956196d47dec3a3ece860a;p=linux-2.6-omap-h63xx.git Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6: arch/parisc/kernel/perf_asm.S: build fix parisc: remove -traditional from assembler flags parisc: use conditional macro for 64-bit wide ops parisc: Remove ioctl.h content picked up from . arch/parisc/kernel/unaligned.c: use time_* macros parisc: remove redundant display of free swap space in show_mem() drivers/parisc: replace remaining __FUNCTION__ occurrences parisc: replace remaining __FUNCTION__ occurrences parisc: new termios definitions parisc: fix trivial section name warnings --- 713c0515a555952d53956196d47dec3a3ece860a