From: Linus Torvalds Date: Wed, 5 Mar 2008 04:20:32 +0000 (-0800) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 X-Git-Tag: v2.6.25-rc4~3 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=665c1ef8369138dad7773da6407fe77ccff87deb;p=linux-2.6-omap-h63xx.git Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC]: Fix link errors with gcc-4.3 sparc64: replace remaining __FUNCTION__ occurances sparc: replace remaining __FUNCTION__ occurances [SPARC]: Add reboot_command[] extern decl to asm/system.h [SPARC]: Mark linux_sparc_{fpu,chips} static. --- 665c1ef8369138dad7773da6407fe77ccff87deb