From: Linus Torvalds Date: Sat, 27 Oct 2007 17:11:12 +0000 (-0700) Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 X-Git-Tag: v2.6.24-rc2~128 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a2508c0814c6d2c0259fa859a6184343b1e39ea3;p=linux-2.6-omap-h63xx.git Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC32]: Fix build-warning in io-unit.c [SPARC64]: Fix BACKOFF_SPIN on non-SMP. [SPARC32]: __inline__ --> inline [SPARC64]: __inline__ --> inline --- a2508c0814c6d2c0259fa859a6184343b1e39ea3