From: Linus Torvalds Date: Wed, 2 Jan 2008 05:30:42 +0000 (-0800) Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=dc512814b5f8b7b80c74d6170b93a606ae4f36c5;p=openwrt%2Fstaging%2Fblogic.git Merge branch 'merge' of git://git./linux/kernel/git/paulus/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] Fix build failure on Cell when CONFIG_SPU_FS=y --- dc512814b5f8b7b80c74d6170b93a606ae4f36c5