From: Linus Torvalds Date: Mon, 22 Dec 2008 18:17:19 +0000 (-0800) Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus X-Git-Tag: v2.6.28~13 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2e8569669805c2d2620527464c395279b74892fc;p=linux-2.6-omap-h63xx.git Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: MIPS: MIPS64R2: Fix buggy __arch_swab64 MIPS: Fix preprocessor warnings flaged by GCC 4.4 --- 2e8569669805c2d2620527464c395279b74892fc